Changes
Resolved merge conflict