Delete residual files from merge commits?