* - committing changes lost during conflict resolution - adding more tests - marking tests to run in parallel to speed things up - changed case of mongoDbUrl to mongodbUrl - modified preflight -all output