Commit to create a new Conflict in merge
Fixed the merge conflict