resolve merge conflicts

www/common/fsStore.js

@@ -175,9 +175,7 @@ define([
 
             // copy User_hash into sessionStorage because cross-domain iframes
             // on safari replaces localStorage with sessionStorage or something
-            if (sessionStorage) {
+            if (sessionStorage) { sessionStorage.setItem('User_hash', localStorage.getItem('User_hash')); }
-                sessionStorage.setItem('User_hash', localStorage.getItem('User_hash'));
-            }
 
             var localToken = tryParsing(localStorage.getItem(tokenKey));
             if (localToken === null) {