fixed appbar in album screen

lib/ui/collection_page.dart

@@ -45,33 +45,12 @@ class CollectionPage extends StatelessWidget {
     );
     return Scaffold(
       appBar: PreferredSize(
-<<<<<<< HEAD
         preferredSize: Size.fromHeight(50.0),
         child: GalleryAppBarWidget(
           appBarType,
           c.collection.name, //title
           _selectedFiles,
           collection: c.collection,
-=======
-        preferredSize: Size.fromHeight(108),
-        child: Column(
-          crossAxisAlignment: CrossAxisAlignment.start,
-          children: [
-            GalleryAppBarWidget(
-              appBarType,
-              c.collection.name,
-              _selectedFiles,
-              collection: c.collection,
-            ),
-            Padding(
-              padding: const EdgeInsets.fromLTRB(12, 12, 0, 0),
-              child: Text(
-                c.collection.name,
-                style: Theme.of(context).textTheme.headline5,
-              ),
-            ),
-          ],
->>>>>>> redesign
         ),
       ),
       body: gallery,