modify commit 1 and push as new
resolve conflict