integrate trunk to branch (Taxeditor)