add mergeLog to merge algorithm
reconstruct retrieve and commit
fix function checkModified
test for commit and retrieve passed
test for merge passed
fix bugs in mergeLog
reconstruct mergeControlWin