diff --git a/pom.xml b/pom.xml
index f68615b..c91e15a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -155,6 +155,26 @@
                 <artifactId>maven-surefire-plugin</artifactId>
                 <version>2.22.2</version>
             </plugin>
+
+            <plugin>
+                <artifactId>maven-checkstyle-plugin</artifactId>
+                <version>3.1.1</version>
+                <configuration>
+                    <configLocation>${project.build.directory}/../src/test/resources/checkstyle.xml</configLocation>
+                    <consoleOutput>true</consoleOutput>
+                    <failsOnError>true</failsOnError>
+                    <sourceDirectories>${project.build.directory}/../src/main/java</sourceDirectories>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>validate</id>
+                        <phase>validate</phase>
+                        <goals>
+                            <goal>check</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
 
diff --git a/src/main/java/edu/kit/typicalc/model/step/InferenceStep.java b/src/main/java/edu/kit/typicalc/model/step/InferenceStep.java
index 488437e..be0ea21 100644
--- a/src/main/java/edu/kit/typicalc/model/step/InferenceStep.java
+++ b/src/main/java/edu/kit/typicalc/model/step/InferenceStep.java
@@ -1,7 +1,11 @@
 package edu.kit.typicalc.model.step;
 
 import edu.kit.typicalc.model.Conclusion;
+<<<<<<< HEAD
 import edu.kit.typicalc.model.Constraint;
+=======
+
+>>>>>>> 0f6c701 (Checkstyle für Maven konfiguriert)
 /**
  * Models one step of the inference tree.
  * Depending on the inference rule that is applied in a step,
@@ -46,4 +50,13 @@ public abstract class InferenceStep {
      * @param stepVisitor the visitor that wants to visit this object
      */
     public abstract void accept(StepVisitor stepVisitor);
+<<<<<<< HEAD
 }
+=======
+
+    public Conclusion getConclusion() {
+        return null; // TODO
+    }
+
+}
+>>>>>>> 0f6c701 (Checkstyle für Maven konfiguriert)
diff --git a/src/test/resources/checkstyle_typicalc.xml b/src/test/resources/checkstyle.xml
similarity index 100%
rename from src/test/resources/checkstyle_typicalc.xml
rename to src/test/resources/checkstyle.xml