Commit in spite of conflict
resolve conflict