Resolve merge conflict error.