Another merge conflict issue