diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index a4d0d05..44de849 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -20,7 +20,7 @@
             </intent-filter>
         </activity>
         <activity android:name=".activities.BoardActivity"
-            android:theme="@style/AppTheme.NoActionBar" >
+            android:theme="@style/AppTheme.NoActionBar" > <!-- Dirty trick to avoid toolbar error on balance -->
         </activity>
         <activity android:name=".activities.AccountSeedsManagementActivity" >
         </activity>
diff --git a/app/src/main/java/cy/agorise/crystalwallet/activities/BoardActivity.java b/app/src/main/java/cy/agorise/crystalwallet/activities/BoardActivity.java
index 8e7fe0c..2fcde53 100644
--- a/app/src/main/java/cy/agorise/crystalwallet/activities/BoardActivity.java
+++ b/app/src/main/java/cy/agorise/crystalwallet/activities/BoardActivity.java
@@ -68,7 +68,7 @@ public class BoardActivity  extends AppCompatActivity {
                         .setAction("Action", null).show();
             }
         });*/
-        
+
         // Hide Add Contact fab, it won't hide until first page changed...
         fabAddContact.hide();
 
diff --git a/app/src/main/res/layout/board.xml b/app/src/main/res/layout/board.xml
index 5e009a2..8ce9fe2 100644
--- a/app/src/main/res/layout/board.xml
+++ b/app/src/main/res/layout/board.xml
@@ -5,10 +5,6 @@
     android:id="@+id/main_content"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-<<<<<<< HEAD
-    app:theme="@style/AppTheme.NoActionBar"
-=======
->>>>>>> Added custom toolbar and tab labels to board activity
     android:fitsSystemWindows="true">
 
     <android.support.design.widget.AppBarLayout
@@ -26,11 +22,7 @@
             android:background="?attr/colorPrimary"
             app:layout_scrollFlags="scroll|enterAlways"
             app:popupTheme="@style/AppTheme.PopupOverlay"
-<<<<<<< HEAD
             app:title="Client Logo">
-=======
-            app:title="@string/app_name">
->>>>>>> Added custom toolbar and tab labels to board activity
 
         </android.support.v7.widget.Toolbar>
 
@@ -67,22 +59,14 @@
         app:layout_behavior="@string/appbar_scrolling_view_behavior"/>
 
     <android.support.design.widget.FloatingActionButton
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> Added bottom buttons to balance, transactions and contacts
         android:id="@+id/fabReceive"
         android:layout_width="250dp"
         android:layout_height="250dp"
         android:layout_gravity="start|bottom"
         android:layout_marginBottom="-125dp"
         android:layout_marginStart="-125dp"
-<<<<<<< HEAD
         app:backgroundTint="@color/white"
         app:srcCompat="@drawable/receive_icon" />
-=======
-        app:srcCompat="@android:drawable/ic_dialog_email" />
->>>>>>> Added bottom buttons to balance, transactions and contacts
 
     <android.support.design.widget.FloatingActionButton
         android:id="@+id/fabSend"
@@ -95,12 +79,6 @@
 
     <android.support.design.widget.FloatingActionButton
         android:id="@+id/fabAddContact"
-<<<<<<< HEAD
-=======
-        android:id="@+id/fab"
->>>>>>> Added custom toolbar and tab labels to board activity
-=======
->>>>>>> Added bottom buttons to balance, transactions and contacts
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="end|bottom"