merged old master with new master