merged new code base