diff --git a/client/src/components/JobInformation/JobInformation.vue b/client/src/components/JobInformation/JobInformation.vue
index 59e222a51152..cdc1e50af207 100644
--- a/client/src/components/JobInformation/JobInformation.vue
+++ b/client/src/components/JobInformation/JobInformation.vue
@@ -165,66 +165,9 @@ function filterMetadata(jobMessages) {
     </div>
 </template>
 
-<<<<<<< HEAD
-<script>
-import CopyToClipboard from "components/CopyToClipboard";
-import { JobDetailsProvider } from "components/providers/JobProvider";
-import UtcDate from "components/UtcDate";
-import { formatDuration, intervalToDuration } from "date-fns";
-import { getAppRoot } from "onload/loadConfig";
-import JOB_STATES_MODEL from "utils/job-states-model";
-
-import DecodedId from "../DecodedId.vue";
-import CodeRow from "./CodeRow.vue";
-
-export default {
-    components: {
-        CodeRow,
-        DecodedId,
-        JobDetailsProvider,
-        UtcDate,
-        CopyToClipboard,
-    },
-    props: {
-        job_id: {
-            type: String,
-            required: true,
-        },
-        includeTimes: {
-            type: Boolean,
-            default: false,
-        },
-    },
-    data() {
-        return {
-            job: null,
-        };
-    },
-    computed: {
-        runTime: function () {
-            return formatDuration(
-                intervalToDuration({ start: new Date(this.job.create_time), end: new Date(this.job.update_time) })
-            );
-        },
-        jobIsTerminal() {
-            return this.job && !JOB_STATES_MODEL.NON_TERMINAL_STATES.includes(this.job.state);
-        },
-    },
-    methods: {
-        getAppRoot() {
-            return getAppRoot();
-        },
-        updateJob(job) {
-            this.job = job;
-        },
-    },
-};
-</script>
-=======
 <style scoped>
 .tooltipJobInfo {
     text-decoration-line: underline;
     text-decoration-style: dashed;
 }
 </style>
->>>>>>> 1a7547f49a (Added job error message detail)