Cleanup extra merge files