You have been called in mediate a conflict between two developers.
John wants to change the script to print “Hello World!”, while Josh wants to change the script to print “Hello Everyone!” and they cannot come to a compromise.
Try to merge Josh’s branch (branch name josh) into main. You should encounter a merge conflict.
Fix the merge conflict created by merging both John’s and Josh’s changes, setting the text to “Hello Everyone and World!” instead.