Resolved merge conflict, fixed links