commit to resolve merge conflicts