diff --git a/.travis.yml b/.travis.yml
index b93ab1b..e115d04 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,12 +1,8 @@
 language: objective-c
-<<<<<<< HEAD
 osx_image: xcode8.3
 branches:
   only:
     - develop
-=======
-osx_image: xcode8.2
->>>>>>> uiimprovement
 before_install:
     - echo -e "machine github.com\n  login $GITHUB_ACCESS_TOKEN" >> ~/.netrc
 script:
diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index 07e7ac1..ca14983 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -52,22 +52,13 @@ platform :ios do
       keychain_password: ENV["MATCH_KEYCHAIN_PASSWORD"],
       readonly: true
     )
-<<<<<<< HEAD
     # ensure_git_status_clean
-=======
-    ensure_git_status_clean
->>>>>>> uiimprovement
     increment_build_number(
       build_number: latest_testflight_build_number + 1,
       xcodeproj: "pass.xcodeproj"
     )
-<<<<<<< HEAD
     # commit_version_bump(xcodeproj: "pass.xcodeproj")
     # push_to_git_remote
-=======
-    commit_version_bump(xcodeproj: "pass.xcodeproj")
-    push_to_git_remote(local_branch: "develop")
->>>>>>> uiimprovement
     gym(scheme: "pass")
     pilot(skip_waiting_for_build_processing: true)
     mailgun(