prep_for_master to master