first merge and sync