resolving conflicts in configuration files
removing cdi imports
removing unused imports