Index: tests/pybin/settings.py
===================================================================
--- tests/pybin/settings.py	(revision 5c4a473263a1f2ef808350180716b59825140af6)
+++ tests/pybin/settings.py	(revision 6daaee3ee6c5b06026c6165d074be69373159877)
@@ -114,30 +114,24 @@
 def init( options ):
 	global arch
+	global archive
+	global debug
+	global distcc
 	global dry_run
 	global generating
+	global install
 	global make
-	global debug
-	global install
+	global output_width
 	global timeout
-	global output_width
-<<<<<<< HEAD
-	global distcc
-=======
-	global archive
->>>>>>> master
 
+	arch         = Architecture(options.arch)
+	archive      = os.path.abspath(os.path.join(original_path, options.archive_errors)) if options.archive_errors else None
+	debug        = Debug(options.debug)
+	distcc       = "DISTCC_CFA_PATH=~/.cfadistcc/%s/cfa" % tools.config_hash()
 	dry_run      = options.dry_run
 	generating   = options.regenerate_expected
+	install      = Install(options.install)
 	make         = ['make']
-	debug        = Debug(options.debug)
-	install      = Install(options.install)
-	arch         = Architecture(options.arch)
+	output_width = 24
 	timeout      = Timeouts(options.timeout, options.global_timeout)
-	output_width = 24
-<<<<<<< HEAD
-	distcc       = "DISTCC_CFA_PATH=~/.cfadistcc/%s/cfa" % tools.config_hash()
-=======
-	archive      = os.path.abspath(os.path.join(original_path, options.archive_errors)) if options.archive_errors else None
->>>>>>> master
 
 	if distribute and not os.environ.get('DISTCC_LOG'):