merge conflict issue