Commit to pull changes.
Resolved merge conflict.