[BUGFIX] Fix EmConfUtility::fixEmConf conflicts generation