Resolved merge conflicts with all branches