fix merge issues

lib/gen/meta.dart

@@ -0,0 +1,8 @@
+/// DO NOT EDIT THIS FILE EXCEPT TO ENTER INITIAL VERSION AND OTHER META INFO
+/// THIS FILE IS AUTOMATICALLY OVERWRITTEN
+
+class Meta {
+  static const String version = '0.0.0+0-dev';
+  static const int buildTime = 71727248562000;
+  static const bool devBuild = true;
+}