checkout, prepare for merge