diff --git a/.gitignore b/.gitignore
index 5d4534b..3f16522 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /.DS_Store
 *.xcbkptlist
-*.xcuserstate
\ No newline at end of file
+*.xcuserstate
+xcshareddata
diff --git a/Classes/PutIOSync-Info.plist b/Classes/PutIOSync-Info.plist
index a3f4215..afddc84 100644
--- a/Classes/PutIOSync-Info.plist
+++ b/Classes/PutIOSync-Info.plist
@@ -30,11 +30,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-<<<<<<< HEAD
 	<string>330</string>
-=======
-	<string>326</string>
->>>>>>> release/0.8.2_beta
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.utilities</string>
 	<key>LSMinimumSystemVersion</key>