1st merge