edit from master without merge