diff --git a/frontend/src/store/store.js b/frontend/src/store/store.js
index c178da23c..ecddfba22 100644
--- a/frontend/src/store/store.js
+++ b/frontend/src/store/store.js
@@ -121,33 +121,6 @@ export const store = new Vuex.Store({
       $cookies.remove('gdd_lang')
       router.push('/Login')
     },
-<<<<<<< HEAD
-    ajaxCreate: async ({ dispatch, state }) => {
-      //console.log('action: ajaxCreate')
-
-      state.ajaxCreateData.amount = state.ajaxCreateData.amount * 10000
-
-      const result = await communityAPI.send(
-        state.session_id,
-        state.ajaxCreateData.email,
-        state.ajaxCreateData.amount,
-        state.ajaxCreateData.memo,
-      )
-      //console.log(result)
-
-      if (result.success) {
-        //console.log('send success')
-      } else {
-        //console.log('send error')
-      }
-      return result
-    },
-    ajaxListTransactions: async ({ commit, dispatch, state }) => {
-      // console.log('action: ajaxListTransactions', state.session_id)
-      // const result = await communityAPI.transactions(state.session_id)
-    },
-=======
->>>>>>> master
     accountBalance: async ({ commit, dispatch, state }) => {
       const result = await communityAPI.balance($cookies.get('gdd_session_id'))
       if (result.success) {
diff --git a/frontend/src/views/KontoOverview/GddSend.vue b/frontend/src/views/KontoOverview/GddSend.vue
index 0e5ecbbbc..7a6997e60 100644
--- a/frontend/src/views/KontoOverview/GddSend.vue
+++ b/frontend/src/views/KontoOverview/GddSend.vue
@@ -138,7 +138,6 @@
 
         <b-list-group>
           <b-list-group-item class="d-flex justify-content-between align-items-center">
-<<<<<<< HEAD
             {{ $store.state.ajaxCreateData.email }}
             <b-badge variant="primary" pill>{{ $t('form.receiver') }}</b-badge>
           </b-list-group-item>
@@ -155,24 +154,6 @@
           <b-list-group-item class="d-flex justify-content-between align-items-center">
             {{ $moment($store.state.ajaxCreateData.target_date).format('DD.MM.YYYY - HH:mm:ss') }}
             <b-badge variant="primary" pill>{{ $t('form.date') }}</b-badge>
-=======
-            {{ ajaxCreateData.email }}
-            <b-badge variant="primary" pill>Empfänger</b-badge>
-          </b-list-group-item>
-
-          <b-list-group-item class="d-flex justify-content-between align-items-center">
-            {{ ajaxCreateData.amount }} GDD
-            <b-badge variant="primary" pill>Betrag</b-badge>
-          </b-list-group-item>
-
-          <b-list-group-item class="d-flex justify-content-between align-items-center">
-            {{ ajaxCreateData.memo }}
-            <b-badge variant="primary" pill>Nachricht</b-badge>
-          </b-list-group-item>
-          <b-list-group-item class="d-flex justify-content-between align-items-center">
-            {{ $moment(ajaxCreateData.target_date).format('DD.MM.YYYY - HH:mm:ss') }}
-            <b-badge variant="primary" pill>Datum</b-badge>
->>>>>>> master
           </b-list-group-item>
         </b-list-group>
         <hr />
@@ -243,10 +224,7 @@ export default {
   computed: {},
   methods: {
     async onDecode(decodedString) {
-<<<<<<< HEAD
       //console.log('onDecode JSON.parse(decodedString)', JSON.parse(decodedString))
-=======
->>>>>>> master
       const arr = JSON.parse(decodedString)
       this.form.email = arr[0].email
       this.form.amount = arr[0].amount