modify

@@ -41,14 +41,7 @@ const mutations = {
   SET_APPHEADERBLOCKCH: (state, height) => {
     state.headerBlockClientHeight = height;
   },
-<<<<<<< HEAD
 }
-=======
-  SET_APPMAINBLOCKCH: (state, height) => {
-    state.appMainBlockClientHeight = height;
-  },
-};
->>>>>>> test
 
 const actions = {
   toggleSideBar({ commit }) {
@@ -63,15 +56,6 @@ const actions = {
   setSize({ commit }, size) {
     commit("SET_SIZE", size);
   },
-<<<<<<< HEAD
-=======
-  setAppHeaderBlockCH({ commit }, height) {
-    commit("SET_APPHEADERBLOCKCH", height);
-  },
-  setAppMainBlockCH({ commit }, height) {
-    commit("SET_APPMAINBLOCKCH", height);
-  },
->>>>>>> test
 };
 
 export default {