Conflicts fixed (with tf) on:
        admin/include_general.php
        admin/include_intertiki.php
        db/config/controllers.xml
        lib/core/Search/Indexer.php
        lib/core/Services/Edit/PluginController.php
        lib/core/Tiki/MemoryLimit.php
        lib/prefs/wikiplugin.php
        templates/admin/include_calendar.tpl
        templates/admin/include_print.tpl
Setup and composer update to follow...