commit local
resolve conflict
commit