I’m trying to merge FleX and HairWorks, and tons of file conflicts occured, how did you avoid this please?