diff --git a/.gitignore b/.gitignore
index e716903ad..22ea9c216 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,7 +7,11 @@ target/*
 */target/*
 /bin
 .idea
+<<<<<<< HEAD
+*.iml
+=======
 *.iml
 docs/jstorm-doc/_site
 docs/jstorm-doc/.sass-cache
-docs/jstorm-doc/target
\ No newline at end of file
+docs/jstorm-doc/target
+>>>>>>> e8b4ac859fd5c7cef27517bc0ff950748d810f4b
diff --git a/example/sequence-split-merge/.gitignore b/example/sequence-split-merge/.gitignore
index 1dd333108..e31376b82 100755
--- a/example/sequence-split-merge/.gitignore
+++ b/example/sequence-split-merge/.gitignore
@@ -1,2 +1,4 @@
 /target/
-/target/
+.project
+.settings/
+.classpath
\ No newline at end of file
diff --git a/jstorm-core/.gitignore b/jstorm-core/.gitignore
index b83d22266..e31376b82 100755
--- a/jstorm-core/.gitignore
+++ b/jstorm-core/.gitignore
@@ -1 +1,4 @@
 /target/
+.project
+.settings/
+.classpath
\ No newline at end of file
diff --git a/jstorm-on-yarn/.gitignore b/jstorm-on-yarn/.gitignore
new file mode 100644
index 000000000..e31376b82
--- /dev/null
+++ b/jstorm-on-yarn/.gitignore
@@ -0,0 +1,4 @@
+/target/
+.project
+.settings/
+.classpath
\ No newline at end of file
diff --git a/jstorm-ui/.gitignore b/jstorm-ui/.gitignore
index b83d22266..b0de758d8 100755
--- a/jstorm-ui/.gitignore
+++ b/jstorm-ui/.gitignore
@@ -1 +1,5 @@
 /target/
+*.class
+.project
+.settings/
+.classpath
\ No newline at end of file
diff --git a/jstorm-utility/jstorm-kafka/.gitignore b/jstorm-utility/jstorm-kafka/.gitignore
index b83d22266..e31376b82 100644
--- a/jstorm-utility/jstorm-kafka/.gitignore
+++ b/jstorm-utility/jstorm-kafka/.gitignore
@@ -1 +1,4 @@
 /target/
+.project
+.settings/
+.classpath
\ No newline at end of file
diff --git a/jstorm-utility/jstorm-rocket-mq/.gitignore b/jstorm-utility/jstorm-rocket-mq/.gitignore
new file mode 100644
index 000000000..e31376b82
--- /dev/null
+++ b/jstorm-utility/jstorm-rocket-mq/.gitignore
@@ -0,0 +1,4 @@
+/target/
+.project
+.settings/
+.classpath
\ No newline at end of file
diff --git a/jstorm-utility/jstorm-rocket-mq/target/classes/META-INF/MANIFEST.MF b/jstorm-utility/jstorm-rocket-mq/target/classes/META-INF/MANIFEST.MF
deleted file mode 100644
index 458dd09cf..000000000
--- a/jstorm-utility/jstorm-rocket-mq/target/classes/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,5 +0,0 @@
-Manifest-Version: 1.0
-Built-By: basti.lj
-Build-Jdk: 1.6.0_45
-Created-By: Maven Integration for Eclipse
-
diff --git a/jstorm-utility/jstorm-rocket-mq/target/classes/META-INF/maven/com.alibaba.jstorm/metaspout/pom.properties b/jstorm-utility/jstorm-rocket-mq/target/classes/META-INF/maven/com.alibaba.jstorm/metaspout/pom.properties
deleted file mode 100644
index ad01a9167..000000000
--- a/jstorm-utility/jstorm-rocket-mq/target/classes/META-INF/maven/com.alibaba.jstorm/metaspout/pom.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-#Generated by Maven Integration for Eclipse
-#Mon Nov 03 15:24:06 CST 2014
-version=0.2.0-SNAPSHOT
-groupId=com.alibaba.jstorm
-m2e.projectName=metaspout
-m2e.projectLocation=D\:\\code\\aloha_branch\\github_master\\jstorm\\jstorm-utility\\jstorm-rocket-mq
-artifactId=metaspout
diff --git a/jstorm-utility/jstorm-rocket-mq/target/classes/META-INF/maven/com.alibaba.jstorm/metaspout/pom.xml b/jstorm-utility/jstorm-rocket-mq/target/classes/META-INF/maven/com.alibaba.jstorm/metaspout/pom.xml
deleted file mode 100644
index ffc611e24..000000000
--- a/jstorm-utility/jstorm-rocket-mq/target/classes/META-INF/maven/com.alibaba.jstorm/metaspout/pom.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-    <groupId>com.alibaba.jstorm</groupId>
-    <artifactId>metaspout</artifactId>
-    <version>0.2.0-SNAPSHOT</version>
-
-	<properties>
-		<jstorm.version>0.9.6.1</jstorm.version>
-	</properties>
-	
-	<build>
-		<plugins>
-			<plugin>
-				<artifactId>maven-assembly-plugin</artifactId>
-				<configuration>
-					<descriptorRefs>
-						<descriptorRef>jar-with-dependencies</descriptorRef>
-					</descriptorRefs>
-				</configuration>
-				<executions>
-					<execution>
-						<id>make-assembly</id>
-						<phase>package</phase>
-						<goals>
-							<goal>single</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-compiler-plugin</artifactId>
-				<configuration>
-					<source>1.6</source>
-					<target>1.6</target>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
-
-	<dependencies>
-	    <dependency>
-			<groupId>com.alibaba.jstorm</groupId>
-			<artifactId>jstorm-client</artifactId>
-			<version>${jstorm.version}</version>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>com.alibaba.jstorm</groupId>
-			<artifactId>jstorm-client-extension</artifactId>
-			<version>${jstorm.version}</version>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>com.alibaba.jstorm</groupId>
-			<artifactId>jstorm-server</artifactId>
-			<version>${jstorm.version}</version>
-			<scope>provided</scope>
-		</dependency>
-
-		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-			<version>4.4</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>com.taobao.metaq.final</groupId>
-			<artifactId>metaq-client</artifactId>
-			<version>3.1.8</version>
-		</dependency>
-		<!-- 
-		<dependency>
-			<groupId>com.alibaba.rocketmq</groupId>
-			<artifactId>rocketmq-common</artifactId>
-			<version>3.0.1</version>
-		</dependency>
-		<dependency>
-			<groupId>com.alibaba.rocketmq</groupId>
-			<artifactId>rocketmq-client</artifactId>
-			<version>3.0.1</version>
-		</dependency>
-		<dependency>
-			<groupId>com.alibaba.rocketmq</groupId>
-			<artifactId>rocketmq-remoting</artifactId>
-			<version>3.0.1</version>
-		</dependency>
-		 -->
-
-	</dependencies>
-
-</project>
diff --git a/jstorm-utility/ons/.gitignore b/jstorm-utility/ons/.gitignore
new file mode 100644
index 000000000..e31376b82
--- /dev/null
+++ b/jstorm-utility/ons/.gitignore
@@ -0,0 +1,4 @@
+/target/
+.project
+.settings/
+.classpath
\ No newline at end of file
diff --git a/jstorm-utility/transaction_meta_spout/.gitignore b/jstorm-utility/transaction_meta_spout/.gitignore
new file mode 100644
index 000000000..e31376b82
--- /dev/null
+++ b/jstorm-utility/transaction_meta_spout/.gitignore
@@ -0,0 +1,4 @@
+/target/
+.project
+.settings/
+.classpath
\ No newline at end of file