merged everything to the master