initialize commit
resolve conflict