Added conflicts check in the GeneticScheduleGenerator
Merge remote-tracking branch 'origin/master' into testfiles