commit remote
create conflict
resolve conflict