diff --git a/src/Calculator/App.xaml b/src/Calculator/App.xaml
index c8ddc1f8..28041308 100644
--- a/src/Calculator/App.xaml
+++ b/src/Calculator/App.xaml
@@ -356,9 +356,6 @@
                 <Setter Property="ZoomMode" Value="Disabled"/>
             </Style>
 
-<<<<<<< HEAD
-            <Style x:Key="CalculationResultStyle" TargetType="Controls:CalculationResult">
-=======
             <Style x:Key="CalculationResultStyleL" TargetType="Controls:CalculationResult">
                 <Setter Property="Background" Value="Transparent"/>
                 <Setter Property="Foreground" Value="{ThemeResource SystemControlPageTextBaseHighBrush}"/>
@@ -534,7 +531,9 @@
                 </Setter>
             </Style>
             <Style x:Key="CalculationResultStyleS" TargetType="Controls:CalculationResult">
->>>>>>> f6848a5... Completed View (Calculator.xaml)
+
+            <Style x:Key="CalculationResultStyle"
+                   TargetType="Controls:CalculationResult">
                 <Setter Property="Background" Value="Transparent"/>
                 <Setter Property="Foreground" Value="{ThemeResource SystemControlPageTextBaseHighBrush}"/>
                 <Setter Property="HorizontalAlignment" Value="Stretch"/>
diff --git a/src/Calculator/Views/Calculator.xaml b/src/Calculator/Views/Calculator.xaml
index 186ebd3a..0b84b422 100644
--- a/src/Calculator/Views/Calculator.xaml
+++ b/src/Calculator/Views/Calculator.xaml
@@ -36,110 +36,7 @@
         </DataTemplate>
 
         <!-- TextBox Styles -->
-<<<<<<< HEAD
-       
-=======
-
-        <Style x:Key="OperandTextBoxStyle" TargetType="controls:OperandTextBox">
-            <Setter Property="MinWidth" Value="32"/>
-            <Setter Property="MinHeight" Value="20"/>
-            <Setter Property="Background" Value="Transparent"/>
-            <Setter Property="SelectionHighlightColor" Value="{ThemeResource SystemControlBackgroundAccentBrush}"/>
-            <Setter Property="FontSize" Value="{ThemeResource BodyFontSize}"/>
-            <Setter Property="IsTextScaleFactorEnabled" Value="False"/>
-            <Setter Property="TextAlignment" Value="Center"/>
-            <Setter Property="Padding" Value="2,0,3,0"/>
-            <Setter Property="Template">
-                <Setter.Value>
-                    <ControlTemplate TargetType="controls:OperandTextBox">
-                        <Grid x:Name="BackgroundElement" Background="{ThemeResource SystemControlBackgroundAltHighBrush}">
-                            <VisualStateManager.VisualStateGroups>
-                                <VisualStateGroup x:Name="CommonStates">
-                                    <VisualState x:Name="Disabled"/>
-                                    <VisualState x:Name="Normal">
-                                        <VisualState.Setters>
-                                            <Setter Target="ContentElement.Foreground" Value="{ThemeResource SystemControlForegroundAccentBrush}"/>
-                                        </VisualState.Setters>
-                                    </VisualState>
-                                    <VisualState x:Name="PointerOver">
-                                        <VisualState.Setters>
-                                            <Setter Target="BackgroundElement.Background" Value="{ThemeResource SystemControlHighlightListAccentLowBrush}"/>
-                                        </VisualState.Setters>
-                                    </VisualState>
-                                    <VisualState x:Name="Focused">
-                                        <VisualState.Setters>
-                                            <Setter Target="BackgroundElement.Background" Value="{ThemeResource SystemControlForegroundChromeWhiteBrush}"/>
-                                            <Setter Target="ContentElement.Foreground" Value="{ThemeResource SystemControlBackgroundChromeBlackHighBrush}"/>
-                                        </VisualState.Setters>
-                                    </VisualState>
-                                </VisualStateGroup>
-                            </VisualStateManager.VisualStateGroups>
-                            <ScrollViewer x:Name="ContentElement"
-                                          Padding="{TemplateBinding Padding}"
-                                          VerticalAlignment="Center"
-                                          AutomationProperties.AccessibilityView="Raw"
-                                          HorizontalScrollBarVisibility="Hidden"
-                                          HorizontalScrollMode="Disabled"
-                                          IsDeferredScrollingEnabled="False"
-                                          IsHorizontalRailEnabled="True"
-                                          IsTabStop="False"
-                                          IsVerticalRailEnabled="False"
-                                          VerticalScrollBarVisibility="Disabled"
-                                          VerticalScrollMode="Disabled"
-                                          ZoomMode="Disabled"/>
-                        </Grid>
-                    </ControlTemplate>
-                </Setter.Value>
-            </Setter>
-        </Style>
-
-        <Style x:Key="OperatorTextBoxStyle" TargetType="controls:OperatorTextBox">
-            <Setter Property="MinWidth" Value="4"/>
-            <Setter Property="MinHeight" Value="20"/>
-            <Setter Property="Padding" Value="0"/>
-            <Setter Property="Background" Value="Transparent"/>
-            <Setter Property="Template">
-                <Setter.Value>
-                    <ControlTemplate TargetType="controls:OperatorTextBox">
-                        <Grid x:Name="BackgroundElement" Background="{ThemeResource SystemControlBackgroundAltHighBrush}">
-                            <VisualStateManager.VisualStateGroups>
-                                <VisualStateGroup x:Name="CommonStates">
-                                    <VisualState x:Name="Disabled"/>
-                                    <VisualState x:Name="Normal">
-                                        <VisualState.Setters>
-                                            <Setter Target="TextElement.Foreground" Value="{ThemeResource SystemControlPageTextBaseMediumBrush}"/>
-                                        </VisualState.Setters>
-                                    </VisualState>
-                                    <VisualState x:Name="PointerOver">
-                                        <VisualState.Setters>
-                                            <Setter Target="BackgroundElement.Background" Value="{ThemeResource SystemControlHighlightListAccentLowBrush}"/>
-                                        </VisualState.Setters>
-                                    </VisualState>
-                                    <VisualState x:Name="Focused">
-                                        <VisualState.Setters>
-                                            <Setter Target="BackgroundElement.Background" Value="{ThemeResource SystemControlBackgroundAccentBrush}"/>
-                                            <Setter Target="TextElement.Foreground" Value="{ThemeResource SystemControlForegroundChromeWhiteBrush}"/>
-                                        </VisualState.Setters>
-                                    </VisualState>
-                                </VisualStateGroup>
-                            </VisualStateManager.VisualStateGroups>
-                            <TextBlock x:Name="TextElement"
-                                       Margin="0,-2,0,2"
-                                       HorizontalAlignment="Center"
-                                       VerticalAlignment="Center"
-                                       Foreground="{TemplateBinding Foreground}"
-                                       FontSize="16"
-                                       IsHitTestVisible="True"
-                                       IsTextScaleFactorEnabled="False"
-                                       Text="{Binding Token}"
-                                       TextAlignment="Center"/>
-                        </Grid>
-                    </ControlTemplate>
-                </Setter.Value>
-            </Setter>
-        </Style>
-
->>>>>>> f6848a5... Completed View (Calculator.xaml)
+               
         <Style TargetType="controls:OverflowTextBlock">
             <Setter Property="HorizontalAlignment" Value="Stretch"/>
             <Setter Property="Template">