commit attempt to resolve merge conflicts