Fix merge conflicts

app/src/main/res/layout/activity_about.xml

@@ -4,9 +4,18 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
+<<<<<<< HEAD
     <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent">
+=======
+    <ImageView
+        android:src="@drawable/ic_launcher"
+        android:layout_height="wrap_content"
+        android:layout_width="wrap_content"
+        android:contentDescription= "@string/commons_logo"
+        />
+>>>>>>> origin/fix_lint_issues
 
         <include
             android:id="@+id/toolbar"

app/src/main/res/layout/activity_share.xml

@@ -7,7 +7,14 @@
 
     <RelativeLayout
         android:layout_width="match_parent"
+<<<<<<< HEAD
         android:layout_height="match_parent">
+=======
+        android:layout_height="match_parent"
+        android:scaleType="centerCrop"
+        android:contentDescription="@string/background_image"
+        />
+>>>>>>> origin/fix_lint_issues
 
         <include
             android:id="@+id/toolbar"

app/src/main/res/layout/layout_upload_item.xml

@@ -13,9 +13,13 @@
         android:id="@+id/uploadImage"
         android:layout_width="match_parent"
         android:layout_height="192dp"
+<<<<<<< HEAD
         app:actualImageScaleType="centerCrop"
         app:placeholderImage="@drawable/ic_image_black_24dp"
         app:failureImage="@drawable/ic_error_outline_black_24dp"
+=======
+        android:scaleType="centerCrop"
+>>>>>>> origin/fix_lint_issues
         android:contentDescription="@string/upload_image"
         />
 

app/src/main/res/values/strings.xml

@@ -183,7 +183,10 @@ Tap this message (or hit back) to skip this step.</string>
   <string name="maximum_limit_alert">Unable to display more than 500</string>
   <string name="set_limit">Set Recent Upload Limit</string>
   <string name="login_failed_2fa_not_supported">Two factor authentication is currently not supported.</string>
+<<<<<<< HEAD
   <string name="logout_verification">Do you really want to logout?</string>
+=======
+>>>>>>> origin/fix_lint_issues
   <string name="commons_logo">Commons Logo</string>
   <string name="background_image">Background Image</string>
   <string name="mediaimage_failed">Media Image Failed</string>
@@ -198,7 +201,10 @@ Tap this message (or hit back) to skip this step.</string>
   <string name="welcome_image_welcome_wikipedia">Welcome Wikipedia</string>
   <string name="welcome_image_welcome_copyright">Welcome Copyright</string>
   <string name="welcome_image_sydney_opera_house">Sydney Opera House</string>
+<<<<<<< HEAD
 >>>>>>> [Lint] Add content description to image views
+=======
+>>>>>>> origin/fix_lint_issues
 
   <string name="cancel">Cancel</string>
   <string name="navigation_drawer_open">Open</string>