Multiple slmx file per mdl

Is there a way to have mulitple smlx files for one mdl? Our workflow requires that we work with two branches simultaneously and from time to time merge the first branch into the second one. With this workflow we get a lot of conflicts which cannot be solved easily. Thus we want to have two smlx files for one mdl.