commit number 1
commit number 2
commit number 3
create conflict
resolve conflict