Fixing pom.xml merge, removing development files