MergeConflict.py

# Welcome to the GitHub Workshop!
# We'll explore one of the most dreaded - but inevitable - things in Git... Merge Conflicts!

# Each person should change to following line of code:

print("This was initially just a simple sentence, but now I made it look like code. It doesn't actually matter, but it'll look more familiar this way");
print("Hello world, my name is <NAME_HERE> and my favorite programming language is <LANGUAGE_HERE> ");