Resolved merge conflict #2