Cherry pick merge conflict