Trying out conflict in three files
Merging the conflict files