first merge and CI build