Removing file changes added due to merge conflicts | <Ajay>