merge the master