Resolved merge conflict. Check to see if ok