commit to resolve conflict