Resolved merge conflict in ik slids