# Conflicts: # lib/base_state.dart # lib/main.dart # lib/main_page.dart # lib/order/order_detail_page.dart # lib/view_widget/classic_header.dart # lib/web/web_view/comment_list.dart # pubspec.yaml