deal with confilcts

Signal/Signal-Info.plist

@@ -7,7 +7,7 @@
 		<key>CarthageVersion</key>
 		<string>0.34.0</string>
 		<key>OSXVersion</key>
-		<string>10.15.3</string>
+		<string>10.15.2</string>
 		<key>WebRTCCommit</key>
 		<string>1445d719bf05280270e9f77576f80f973fd847f8 M73</string>
 	</dict>

Signal/src/Loki/View Controllers/HomeVC.swift

@@ -104,15 +104,7 @@ final class HomeVC : UIViewController, UITableViewDataSource, UITableViewDelegat
         tableView.pin(.trailing, to: .trailing, of: view)
         tableView.pin(.bottom, to: .bottom, of: view)
         view.addSubview(fadeView)
-<<<<<<< HEAD
         fadeView.pin(to: view)
-=======
-        fadeView.pin(.leading, to: .leading, of: view)
-        let topInset = 0.15 * view.height()
-        fadeView.pin(.top, to: .top, of: view, withInset: topInset)
-        fadeView.pin(.trailing, to: .trailing, of: view)
-        fadeView.pin(.bottom, to: .bottom, of: view)
->>>>>>> b56fc0d01031a276b79be70736da8a48d720ebb6
         // Set up search bar
 //        tableView.tableHeaderView = searchBar
 //        searchBar.sizeToFit()