diff --git a/.gitignore.orig b/.gitignore.orig
deleted file mode 100644
index 8f9acedc9b119cabbd7691d0423fb3f4a60867fa..0000000000000000000000000000000000000000
--- a/.gitignore.orig
+++ /dev/null
@@ -1,23 +0,0 @@
-**/target
-<<<<<<< HEAD
-*.iml
-.idea/
-codestyle.xml
-=======
-
-# From directories, ignore...
-
-### Idea:
-.idea/
-.idea_modules/
-/out/
-
-### Maven template
-target/
-
-### Eclipse template
-bin/
-tmp/
-.settings/
-
->>>>>>> origin/master
diff --git a/codestyle.xml.orig b/codestyle.xml.orig
deleted file mode 100644
index 9a47d724a7c7521b8c96ea80fe9a7495eadb855b..0000000000000000000000000000000000000000
--- a/codestyle.xml.orig
+++ /dev/null
@@ -1,209 +0,0 @@
-<<<<<<< HEAD
-<?xml version="1.0"?>
-<!DOCTYPE module PUBLIC
- "-//Puppy Crawl//DTD Check Configuration 1.3//EN"
- "http://www.puppycrawl.com/dtds/configuration_1_3.dtd">
-
-<module name="Checker">
- <!--<property name="fileExtensions" value="java, xml, properties"/>-->
-
- <!-- Checks for whitespace -->
- <!-- See http://checkstyle.sf.net/config_whitespace.html -->
- <module name="FileTabCharacter"/>
-
- <module name="TreeWalker">
- <!-- Checks for Javadoc comments. -->
- <!-- See http://checkstyle.sf.net/config_javadoc.html -->
- <module name="JavadocMethod">
- <property name="scope" value="public"/>
- <property name="allowMissingPropertyJavadoc" value="true"/>
- </module>
- <module name="JavadocType">
- <property name="scope" value="public"/>
- </module>
- <module name="JavadocStyle">
- <property name="scope" value="public"/>
- <property name="checkFirstSentence" value="false"/>
- </module>
- <module name="WriteTag">
- <property name="tag" value="@author"/>
- <property name="tagFormat" value="..* ..*"/>
- <!-- What to do if the tag does not exists? -->
- <property name="severity" value="error"/>
- <!-- What to do if the tag exists? -->
- <property name="tagSeverity" value="ignore"/>
- </module>
-
- <!-- Checks for Naming Conventions. -->
- <!-- See http://checkstyle.sf.net/config_naming.html -->
- <module name="ConstantName"/>
- <module name="LocalFinalVariableName"/>
- <module name="LocalVariableName"/>
- <module name="MemberName"/>
- <module name="MethodName"/>
- <module name="PackageName"/>
- <module name="ParameterName"/>
- <module name="StaticVariableName"/>
- <module name="TypeName"/>
-
- <!-- Checks for imports -->
- <!-- See http://checkstyle.sf.net/config_import.html -->
- <module name="AvoidStarImport"/>
- <module name="IllegalImport"/> <!-- defaults to sun.* packages -->
- <module name="RedundantImport"/>
- <module name="UnusedImports"/>
-
- <!-- Checks for Size Violations. -->
- <!-- See http://checkstyle.sf.net/config_sizes.html -->
- <module name="LineLength">
- <property name="max" value="120"/>
- </module>
- <module name="MethodLength">
- <property name="max" value="50"/>
- <property name="countEmpty" value="false"/>
- </module>
- <module name="ParameterNumber"/>
-
- <!-- Modifier Checks -->
- <!-- See http://checkstyle.sf.net/config_modifier.html -->
- <module name="ModifierOrder"/>
- <module name="RedundantModifier"/>
-
- <!-- Checks for blocks. You know, those {}'s -->
- <!-- See http://checkstyle.sf.net/config_blocks.html -->
- <module name="AvoidNestedBlocks"/>
- <module name="LeftCurly">
- <property name="option" value="eol"/>
- </module>
- <module name="NeedBraces">
- <property name="allowSingleLineStatement" value="false"/>
- </module>
- <module name="RightCurly"/>
-
- <!-- Checks for common coding problems -->
- <!-- See http://checkstyle.sf.net/config_coding.html -->
- <module name="EmptyStatement"/>
- <module name="EqualsHashCode"/>
- <module name="MissingSwitchDefault"/>
- <module name="SimplifyBooleanExpression"/>
- <module name="SimplifyBooleanReturn"/>
-
- <!-- Checks for class design -->
- <!-- See http://checkstyle.sf.net/config_design.html -->
- <module name="FinalClass"/>
- <module name="InterfaceIsType"/>
- <module name="VisibilityModifier"/>
-
- <!-- Miscellaneous other checks. -->
- <!-- See http://checkstyle.sf.net/config_misc.html -->
- <module name="ArrayTypeStyle"/>
- </module>
-</module>
-=======
-<?xml version="1.0"?>
-<!DOCTYPE module PUBLIC
- "-//Puppy Crawl//DTD Check Configuration 1.3//EN"
- "http://www.puppycrawl.com/dtds/configuration_1_3.dtd">
-
-<module name="Checker">
- <!--<property name="fileExtensions" value="java, xml, properties"/>-->
-
- <!-- Checks for whitespace -->
- <!-- See http://checkstyle.sf.net/config_whitespace.html -->
- <module name="FileTabCharacter"/>
-
- <module name="TreeWalker">
- <!-- Checks for Javadoc comments. -->
- <!-- See http://checkstyle.sf.net/config_javadoc.html -->
- <module name="MissingJavadocMethodCheck">
- <property name="scope" value="public"/>
- <property name="allowMissingPropertyJavadoc" value="true"/>
- </module>
- <!--<module name="JavadocMethod">
- <property name="scope" value="public"/>
- <property name="allowMissingPropertyJavadoc" value="true"/>
- </module>-->
- <module name="JavadocType">
- <property name="scope" value="public"/>
- </module>
- <module name="JavadocStyle">
- <property name="scope" value="public"/>
- <property name="checkFirstSentence" value="false"/>
- </module>
- <module name="WriteTag">
- <property name="tag" value="@author"/>
- <property name="tagFormat" value="..* ..*"/>
- <!-- What to do if the tag does not exists? -->
- <property name="severity" value="error"/>
- <!-- What to do if the tag exists? -->
- <property name="tagSeverity" value="ignore"/>
- </module>
-
- <!-- Checks for Naming Conventions. -->
- <!-- See http://checkstyle.sf.net/config_naming.html -->
- <module name="ConstantName"/>
- <module name="LocalFinalVariableName"/>
- <module name="LocalVariableName"/>
- <module name="MemberName"/>
- <module name="MethodName"/>
- <module name="PackageName"/>
- <module name="ParameterName"/>
- <module name="StaticVariableName"/>
- <module name="TypeName"/>
-
- <!-- Checks for imports -->
- <!-- See http://checkstyle.sf.net/config_import.html -->
- <module name="AvoidStarImport"/>
- <module name="IllegalImport"/> <!-- defaults to sun.* packages -->
- <module name="RedundantImport"/>
- <module name="UnusedImports"/>
-
- <!-- Checks for Size Violations. -->
- <!-- See http://checkstyle.sf.net/config_sizes.html -->
- <!--<module name="LineLength">
- <property name="max" value="220"/>
- </module>-->
- <module name="MethodLength">
- <property name="max" value="50"/>
- <property name="countEmpty" value="false"/>
- </module>
- <module name="ParameterNumber"/>
-
- <!-- Modifier Checks -->
- <!-- See http://checkstyle.sf.net/config_modifier.html -->
- <module name="ModifierOrder"/>
- <module name="RedundantModifier"/>
-
- <!-- Checks for blocks. You know, those {}'s -->
- <!-- See http://checkstyle.sf.net/config_blocks.html -->
- <module name="AvoidNestedBlocks"/>
- <module name="LeftCurly">
- <property name="option" value="eol"/>
- </module>
- <module name="NeedBraces">
- <property name="allowSingleLineStatement" value="false"/>
- </module>
- <module name="RightCurly"/>
-
- <!-- Checks for common coding problems -->
- <!-- See http://checkstyle.sf.net/config_coding.html -->
- <module name="EmptyStatement"/>
- <module name="EqualsHashCode"/>
- <module name="MissingSwitchDefault"/>
- <module name="SimplifyBooleanExpression"/>
- <module name="SimplifyBooleanReturn"/>
-
- <!-- Checks for class design -->
- <!-- See http://checkstyle.sf.net/config_design.html -->
- <module name="FinalClass"/>
- <module name="InterfaceIsType"/>
- <module name="VisibilityModifier">
- <property name="allowPublicFinalFields" value="true"/>
- </module>
-
- <!-- Miscellaneous other checks. -->
- <!-- See http://checkstyle.sf.net/config_misc.html -->
- <module name="ArrayTypeStyle"/>
- </module>
-</module>
->>>>>>> origin/master