Use commit() to commit merge, rather than using custom code
Tick off todo: use MERGE_HEAD to indicate conflicts
rm MERGE_MSG after merge