Removing files added on a merge but that should not be there anymore