move auto-resolution warning/note higher up per @harikt