add support for merge (multiple parents) in commit
fixup variable name