Resolved merge conflicts #2