Removing file that has been (accidentally) merged back