Fix slimport merge