Resolve conflicting imports test
-- Annotation sort