Added new cloud fixes

frontend/src/views/Admin.jsx

@@ -3532,12 +3532,7 @@ Let me know if you're interested, or set up a call here: https://drift.me/${user
         <div style={{ marginTop: 20, marginBottom: 20 }}>
           <h2 style={{ display: "inline" }}>App Authentication</h2>
           <span style={{ marginLeft: 25 }}>
-<<<<<<< HEAD
-            Control the authentication options for individual apps. PS: Actions
-            performed here can be destructive!
-=======
             Control the authentication options for individual apps. 
->>>>>>> master
           </span>
           &nbsp;
           <a
@@ -3546,11 +3541,7 @@ Let me know if you're interested, or set up a call here: https://drift.me/${user
             href="/docs/organizations#app_authentication"
             style={{ textDecoration: "none", color: "#f85a3e" }}
           >
-<<<<<<< HEAD
-            Learn more about authentication
-=======
             Learn more about App Authentication
->>>>>>> master
           </a>
         </div>
         <Divider

frontend/src/views/SetAuthentication.jsx

@@ -206,6 +206,7 @@ const SetAuthentication = (props) => {
 					.then((responseJson) => {
 						//setUserSettings(responseJson)
 						console.log("Resp: ", responseJson);
+
 						if (responseJson.reason !== undefined) {
 							setResponse(responseJson.reason);
 							setFinished(true);