fix merge conflicts

jam-ui/src/components/page/JKEditProfile.js

@@ -79,9 +79,9 @@ function JKEditProfile() {
         .then(data => {
           setValue('firstName', data.first_name);
           setValue('lastName', data.last_name);
-          setValue('country', data.country);
-          setValue('state', data.state);
-          setValue('city', data.city);
+          setValue('country', data.country ? data.country : '');
+          setValue('state', data.state ? data.state : '');
+          setValue('city', data.city? data.city : '');
           setValue('biography', data.biography);
           setValue('subscribeEmail', data.subscribe_email);
           setValue('virtualBand', data.virtual_band);

jam-ui/src/helpers/rest.js

@@ -42,6 +42,7 @@ export const getPeopleIndex = () => {
       .catch(error => reject(error));
   });
 };
+<<<<<<< HEAD
 
 export const getLobbyUsers = () => {
   return new Promise((resolve, reject) => {
@@ -50,9 +51,12 @@ export const getLobbyUsers = () => {
     .catch(error => reject(error))
   })
 }
+=======
+>>>>>>> c16be142076c0228762477ae926a56507df93da1
 
 export const updateUser = (id, data) => {
   return new Promise((resolve, reject) => {
+<<<<<<< HEAD
     apiFetch(`/users/${id}`, {
       method: 'POST',
       body: JSON.stringify(data)
@@ -61,6 +65,13 @@ export const updateUser = (id, data) => {
     .catch(error => reject(error))
   })
 }
+=======
+    apiFetch('/genres')
+      .then(response => resolve(response))
+      .catch(error => reject(error));
+  });
+};
+>>>>>>> c16be142076c0228762477ae926a56507df93da1
 
 export const getGenres = () => {
   return new Promise((resolve, reject) => {