merger new code