Fix issues.

packages/flutter/lib/src/widgets/automatic_keep_alive.dart

@@ -299,7 +299,7 @@ class KeepAliveHandle extends ChangeNotifier {
 ///
 ///  * [AutomaticKeepAlive], which listens to messages from this mixin.
 ///  * [KeepAliveNotification], the notifications sent by this mixin.
-abstract class AutomaticKeepAliveClientMixin extends State<T> {
+abstract class AutomaticKeepAliveClientMixin extends State<StatefulWidget> {
   // This class is intended to be used as a mixin, and should not be
   // extended directly.
   factory AutomaticKeepAliveClientMixin._() => null;

packages/flutter/lib/src/widgets/ticker_provider.dart

@@ -155,12 +155,7 @@ abstract class SingleTickerProviderStateMixin extends State<T> implements Ticker
 /// If you only have a single [Ticker] (for example only a single
 /// [AnimationController]) for the lifetime of your [State], then using a
 /// [SingleTickerProviderStateMixin] is more efficient. This is the common case.
-<<<<<<< HEAD
-@optionalTypeArgs
-abstract class TickerProviderStateMixin<T extends StatefulWidget> extends State<T> implements TickerProvider { // ignore: TYPE_ARGUMENT_NOT_MATCHING_BOUNDS, https://github.com/dart-lang/sdk/issues/25232
-=======
 abstract class TickerProviderStateMixin extends State<dynamic> implements TickerProvider { // ignore: TYPE_ARGUMENT_NOT_MATCHING_BOUNDS, https://github.com/dart-lang/sdk/issues/25232
->>>>>>> parent of 1c236d524... Fixes in flutter framework code to address the mixin issue raised
   // This class is intended to be used as a mixin, and should not be
   // extended directly.
   factory TickerProviderStateMixin._() => null;