Resolve merge conflict issue