checkout master before anything is pulled so that merge can continue
always update with --init