diff --git a/src/digital-components/button-question/button-question.vue b/src/digital-components/button-question/button-question.vue
index b4c8e89fb..8411627f4 100644
--- a/src/digital-components/button-question/button-question.vue
+++ b/src/digital-components/button-question/button-question.vue
@@ -167,34 +167,6 @@ export default {
             lastValuePushedToGa: null,
         };
     },
-<<<<<<< HEAD:src/digital-components/button-question/button-question.vue
-=======
-    watch: {
-        answers() {
-            //once we get the answers to display from parent, see if we need a GA event to log what we showed
-            if (this.logDisplayedValuesEvent && this.answers.length > 0) {
-                var eventLabel = "";
-                //build comma separated list of all items in button list that we are going to display on page
-                this.answers.forEach((item) => {
-                    if (item.Name) {
-                        eventLabel += item.Name + ",";
-                    }
-                    if (item.buttonLabel) {
-                        eventLabel += item.buttonLabel + ",";
-                    }
-                });
-
-                eventLabel = eventLabel.slice(0, -1); //remove the last comma
-                this.pushEventToGA(
-                    this.$route.query[queryStrings.FMG_PAGE],
-                    this.GaActions.DISPLAYED,
-                    eventLabel,
-                    true
-                );
-            }
-        },
-    },
->>>>>>> 2023.05.04:src/common-components/button-question/button-question.vue
     computed: {
         getFieldSetClasses() {
             const baseClasses = this.isOverflowScrollable