It is not possible to migrate the Control Builder source code from System Baseline 2.1/2 to System Version 3.1 format if the same object is placed in more than one structure (such as both control and functional structure).
The Tools > Maintenance > Upgrade Project command in Control Builder M will in this case fail.
There is no workaround for this problem.