fixing the committed file that had merge conflicts