Removed unused import - fixed as part of resolving conflicts.