mavenized project
changed settings
merged conflicts