Fix conflict resolution stupid

test/test_cli.py

@@ -69,10 +69,3 @@ def test_hello_world(self, tmpdir, runner, package_location, interpreter):
             # now run the produced zipapp
             with subprocess.Popen([output_file], stdout=subprocess.PIPE) as proc:
                 assert proc.stdout.read().decode() == 'hello world\n'
-<<<<<<< HEAD
-=======
-
-    @pytest.mark.skipif(len(sys.executable) > 128, reason='only run this test is the shebang is not too long')
-    def test_real_interpreter(self):
-        assert validate_interpreter(Path(sys.executable)) == Path(sys.executable)
->>>>>>> Remove bogus python test now that it is a warning