Resovled merge conflict in ik default settings