Remove file to solve merge conflicts