Remove files introduced by merge error