Removed the merge conflicts commited to repo by mistake