conf inmport
added submodules
merged