Commit some conflicts resolves