Remove files from a botched merge.
1 file changed