Unused imports weg, warnings supressed
Merge conflict solved