Resolved merge conflicts in API