after merge edd->master_2