diff --git a/kobalt-line-count.iml b/kobalt-line-count.iml
index f2a1075..19eaa71 100644
--- a/kobalt-line-count.iml
+++ b/kobalt-line-count.iml
@@ -5,17 +5,12 @@
     <output-test url="file://$MODULE_DIR$/build/classes/test" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/kotlin" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/kotlin" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
-      <excludeFolder url="file://$MODULE_DIR$/.gradle" />
-      <excludeFolder url="file://$MODULE_DIR$/build" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" isTestSource="false" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="kobalt-line-count (Compile)" level="project" />
+    <orderEntry type="library" scope="TEST" name="kobalt-line-count (Test)" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/kobalt/Build.kt.iml b/kobalt/Build.kt.iml
index acaeaca..3776d3c 100644
--- a/kobalt/Build.kt.iml
+++ b/kobalt/Build.kt.iml
@@ -2,8 +2,6 @@
 <module type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
-    <content url="file://$MODULE_DIR$" />
-    <content url="file://D:/Java/jdk1.8.0_05" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="kobalt.jar" level="project" />
   </component>
diff --git a/kobalt/src/Build.kt b/kobalt/src/Build.kt
index 1f41f68..f793576 100644
--- a/kobalt/src/Build.kt
+++ b/kobalt/src/Build.kt
@@ -17,7 +17,7 @@ val project = project {
     name = "kobalt-line-count"
     group = "com.beust.kobalt"
     artifactId = name
-    version = "0.17"
+    version = "0.18"
 
     dependencies {
         compile("com.beust:kobalt-plugin-api:")
diff --git a/kobalt/wrapper/kobalt-wrapper.properties b/kobalt/wrapper/kobalt-wrapper.properties
index 52290fd..d801ad6 100644
--- a/kobalt/wrapper/kobalt-wrapper.properties
+++ b/kobalt/wrapper/kobalt-wrapper.properties
@@ -1 +1,5 @@
-kobalt.version=0.605
\ No newline at end of file
+<<<<<<< HEAD
+kobalt.version=0.605
+=======
+kobalt.version=0.390
+>>>>>>> 6863392c7dbb354504b955000ced270f22d307be