diff --git a/lint.xml b/lint.xml
new file mode 100644
index 00000000..1b4156cb
--- /dev/null
+++ b/lint.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<lint>
+    <!-- We don't care about incomplete translations. -->
+    <issue id="MissingTranslation" severity="ignore" />
+	
+	<!-- Ignore "Value overridden by Gradle build script" for app
+	version (which is actually read from manifest by gradle). -->
+	<issue id="GradleOverrides" severity="ignore" />
+</lint>
diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml
index 660fb4c2..34a55df7 100644
--- a/src/main/AndroidManifest.xml
+++ b/src/main/AndroidManifest.xml
@@ -3,8 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     package="com.nutomic.syncthingandroid"
     android:versionCode="41"
-    android:versionName="0.5.4"
-    tools:ignore="GradleOverrides" >
+    android:versionName="0.5.4" >
 
     <uses-sdk
         android:minSdkVersion="8"
diff --git a/src/main/res/layout/device_list_item.xml b/src/main/res/layout/device_list_item.xml
index bbd84eb3..4fcf2c05 100644
--- a/src/main/res/layout/device_list_item.xml
+++ b/src/main/res/layout/device_list_item.xml
@@ -54,6 +54,5 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:textAppearance="?android:attr/textAppearanceSmall" />
-    >>>>>>> Changed code style to use spaces instead of tabs.
 
 </RelativeLayout>
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index f437e5af..80251bef 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:tools="http://schemas.android.com/tools"
-    tools:ignore="MissingTranslation" >
+<resources>
 
     <string name="app_name">Syncthing</string>