commit adds parents in MERGE_HEAD

Commit() should add parents in MERGE_HEAD (if it exists) and then clean up the merge metadata files