diff --git a/client/modules/User/reducers.js b/client/modules/User/reducers.js
index b298724d..00454acd 100644
--- a/client/modules/User/reducers.js
+++ b/client/modules/User/reducers.js
@@ -31,15 +31,9 @@ const user = (state = { authenticated: false }, action) => {
       return Object.assign({}, state, { emailVerificationTokenState: 'invalid' });
     case ActionTypes.SETTINGS_UPDATED:
       return { ...state, ...action.user };
-<<<<<<< HEAD
     case ActionTypes.API_KEY_REMOVED:
       return { ...state, ...action.user };
     case ActionTypes.API_KEY_CREATED:
-=======
-    case ActionTypes.REMOVED_API_KEY:
-      return { ...state, ...action.user };
-    case ActionTypes.ADDED_API_KEY:
->>>>>>> You can now generate keys from the advanced settings interface
       return { ...state, ...action.user };
     default:
       return state;