diff --git a/build.gradle b/build.gradle
index 43a6812..34fd249 100644
--- a/build.gradle
+++ b/build.gradle
@@ -47,7 +47,6 @@
 "ui/views/SwipeRefreshLayout/SwipeRefreshLayoutBasic",
 "ui/views/SwipeRefreshLayout/SwipeRefreshListFragment",
 "ui/views/SwipeRefreshLayout/SwipeRefreshMultipleViews",
-<<<<<<< HEAD
 "media/MediaRouter",
 "admin/BasicManagedProfile",
 "media/Camera2Basic",
@@ -61,7 +60,11 @@
 "ui/views/RevealEffect/RevealEffectBasic",
 "background/JobScheduler",
 "wearable/wear/SynchronizedNotifications",
-"media/MediaRouter"
+"ui/views/RecyclerView",
+"ui/views/CardView",
+"ui/notifications/LNotifications",
+"ui/DrawableTinting",
+"ui/Interpolator",
 ]
 
 List<String> taskNames = [