merge new code