Removed unused imports.
Fixed conflict.