pull
cnflict resolve