Resolved merge branch merge conflicts