Fixed wrong conflicthandling, order of loading part files was wrong