diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..42cd73d
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+/vendor/
\ No newline at end of file
diff --git a/.php_cs b/.php_cs
new file mode 100644
index 0000000..1280456
--- /dev/null
+++ b/.php_cs
@@ -0,0 +1,15 @@
+<?php
+
+$finder = PhpCsFixer\Finder::create()
+    ->in(__DIR__ . '/src')
+    ->in(__DIR__ . '/tests')
+;
+
+return PhpCsFixer\Config::create()
+    ->setUsingCache(false)
+    ->setRules([
+        '@PSR2' => true,
+        'array_syntax' => ['syntax' => 'short'],
+    ])
+    ->setFinder($finder)
+;
diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0000000..9c0cb34
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,15 @@
+language: php
+
+php:
+    - 7.0
+    - 7.1
+
+before_install:
+    - composer self-update
+
+install:
+    - travis_retry composer install --no-interaction --prefer-source
+
+script:
+    - make lint
+    - make test
diff --git a/src/Endpoints/TLS.php b/src/Endpoints/TLS.php
index f539d9a..cb67298 100644
--- a/src/Endpoints/TLS.php
+++ b/src/Endpoints/TLS.php
@@ -67,6 +67,7 @@ class TLS implements API
 
         return false;
     }
+<<<<<<< HEAD
     public function getHTTPSRedirectStatus($zoneID) {
         $return = $this->adapter->get(
             'zones/' . $zoneID . '/settings/always_use_https'
@@ -121,4 +122,6 @@ class TLS implements API
 
         return false;
     }
+=======
+>>>>>>> 4694904b38fdf5f251559a473cecf77a63cf9202
 }