Adding script to create a merge conflict with lines modified by two branches
Fix typo