diff --git a/pom.xml b/pom.xml
index 4e5b131c5..2928df18f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -41,8 +41,9 @@
 		<module>null-object</module>
 		<module>event-aggregator</module>
 		<module>callback</module>
-		<module>intercepting-filter</module>
 <<<<<<< HEAD
+		
+		<module>intercepting-filter</module>
   </modules>
 =======
 		<module>execute-around</module>