Try to go back to previous commit. add new file, and then to make a merge