remote branch commit
master commite-remote
resolve conflict
third commit