diff --git a/src/components/ShowManagerModalShow.vue b/src/components/ShowManagerModalShow.vue
index 0e4eeaa7c97eae528644a284100a2c80c79e97c5..2d56e1f3997ef4f8b3b2607e615c2c287df3f1a0 100644
--- a/src/components/ShowManagerModalShow.vue
+++ b/src/components/ShowManagerModalShow.vue
@@ -398,17 +398,10 @@ export default {
     savePredecessor (event) {
       if (this.id !== this.show.predecessor) {
         event.preventDefault()
-<<<<<<< HEAD
         this.backupid = this.show.predecessor_id
         this.show.predecessor_id = this.id
         console.log(this.show.predecessor_id)
         axios.put(process.env.VUE_APP_API_STEERING_SHOWS + this.show.id + '/', this.show, {
-=======
-        this.backupid = this.show.predecessor
-        this.show.predecessor = this.id
-        console.log(this.show.predecessor)
-        axios.put(process.env.API_STEERING_SHOWS + this.show.id + '/', this.show, {
->>>>>>> 3888ff92fbc548600ff336cd605a9e1087a603d9
           withCredentials: true,
           headers: { 'Authorization': 'Bearer ' + this.$parent.$parent.user.access_token }
         }).then(response => {