Generating and Solving Conflicts

Before Conflict: 
```
<<<<<<< HEAD
Hola Mundo
=======
Hello World
>>>>>>> new-branch
```

After:
```
Hello World
```

Answers UCL-COMP0233-24-25/RSE-Classwork#4

Done either by directly editing the conflicting line or through VSCode's merge editor