File to use to test merge conflicts
Fixed typos
Changing conflict file
Merged conflicting branches successfully