Index: /extensions/cl_conflit/template/header_2_1.tpl
===================================================================
--- /extensions/cl_conflit/template/header_2_1.tpl	(revision 8928)
+++ /extensions/cl_conflit/template/header_2_1.tpl	(revision 8928)
@@ -0,0 +1,7 @@
+
+{known_script id="jquery" src = $ROOT_URL|@cat:"themes/default/js/jquery.packed.js" now=1}
+{known_script id="jquery.cluetip" src=$ROOT_URL|@cat:"themes/default/js/plugins/jquery.cluetip.packed.js"} 
+{known_script id="conflit_script" src = $CONFLIT_PATH|@cat:"js/conflit.js"  } 
+{known_script id="dimensions" src = $CONFLIT_PATH|@cat:"js/jquery.dimensions.js"  } 
+
+
Index: /extensions/cl_conflit/template/header_2_2.tpl
===================================================================
--- /extensions/cl_conflit/template/header_2_2.tpl	(revision 8928)
+++ /extensions/cl_conflit/template/header_2_2.tpl	(revision 8928)
@@ -0,0 +1,4 @@
+{combine_script id="jquery" load="header" path = $ROOT_URL|@cat:"themes/default/js/jquery.js"} 
+{combine_script id="jquery.cluetip" path = $ROOT_URL|@cat:"themes/default/js/plugins/jquery.cluetip.js" require="jquery" } 
+{combine_script id="conflit_script" path = $CONFLIT_PATH|@cat:"js/conflit.js" require="jquery"}
+{combine_script id="dimensions" path = $CONFLIT_PATH|@cat:"js/jquery.dimensions.js" require="jquery"} 
Index: /extensions/cl_conflit/template/conflit.tpl
===================================================================
--- /extensions/cl_conflit/template/conflit.tpl	(revision 8629)
+++ /extensions/cl_conflit/template/conflit.tpl	(revision 8928)
@@ -1,7 +1,11 @@
 {html_head} 
-<!--- Autosize/template/confilt.tpl ---> 
-    {known_script id="jquery" src=$ROOT_URL|@cat:"themes/default/js/jquery.packed.js" } 
-    {known_script id="dimensions" src=$CONFLIT_PATH|@cat:"js/jquery.dimensions.js"}
-    {known_script id="conflit_script" src=$CONFLIT_PATH|@cat:"js/conflit.js"}
+<!--- cl_conflit/template/confilt.tpl ---> 
+ 
+{if PHPWG_VERSION < 2.2 } 
+{include file=$CONFLIT_PATH_ABS|@cat:'template/header_2_1.tpl'}
+{else} 
+{include file= $CONFLIT_PATH_ABS|@cat:'template/header_2_2.tpl'} 
+{/if} 
+ 
 {/html_head}   
 <script type="text/javascript">