removes unused imports
fix merge conflicts