Resolve merge conflics