Created a deliberate merge conflict
Fixed merge conflicts