modified:   expt_config.txt
		Resolving inadvertently created conflicts