Fix kk merge conflicts