fix travis CI

pom.xml

@@ -41,15 +41,11 @@
 		<module>null-object</module>
 		<module>event-aggregator</module>
 		<module>callback</module>
-<<<<<<< HEAD
-		
-		<module>intercepting-filter</module>
-  </modules>
-=======
 		<module>execute-around</module>
 		<module>property</module>
+		
+		<module>intercepting-filter</module>
 	</modules>
->>>>>>> origin/master
 
 	<dependencyManagement>
 		<dependencies>