Complete merge with slave code