commit after merging using winmerge
change in commit