update from local
merged locally
resolved merge conflict
commit actually resolved conflict