Properly resolve merge conflict