Cleanup repo after merge to get rid of MERGE_HEAD etc