Accepted changes and resolved merge conflicts