diff --git a/ui/src/kapacitor/components/KapacitorRules.js b/ui/src/kapacitor/components/KapacitorRules.js
index 7ff8cc6837..2697b1dbe0 100644
--- a/ui/src/kapacitor/components/KapacitorRules.js
+++ b/ui/src/kapacitor/components/KapacitorRules.js
@@ -81,7 +81,11 @@ const KapacitorRules = ({
   )
 }
 
+<<<<<<< HEAD
 const PageContents = ({children, source}) =>
+=======
+const PageContents = ({children, source, tickscript, onCloseTickscript}) => (
+>>>>>>> Display TICKscript on rules index
   <div className="page">
     <div className="page-header">
       <div className="page-header__container">