commit to resolve conflicts
commit to fix merge
commit of final changes
commit of final changes