about to merge branches
resolved merge conflicts
fixed merge conflicts