Update merge and build