diff --git a/.gitignore b/.gitignore
index 9c64d4f4..e89b65f1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,14 +24,9 @@ local.properties
 .classpath
 #.project
 
-<<<<<<< HEAD
-# MacOS
-.DS_Store
-=======
 # IDEA project files
 .idea
 
 SDKLauncher-Android/assets/readium-shared-js/epubReadingSystem_.js
 SDKLauncher-Android/.settings/org.eclipse.core.resources.prefs
-SDKLauncher-Android/lint.xml
->>>>>>> release/0.16
+SDKLauncher-Android/lint.xml
\ No newline at end of file
diff --git a/SDKLauncher-Android/libs/android-support-v4.jar b/SDKLauncher-Android/libs/android-support-v4.jar
new file mode 100644
index 00000000..4ebdaa9e
Binary files /dev/null and b/SDKLauncher-Android/libs/android-support-v4.jar differ