diff --git a/modules/base_plugins/brew_steps/__init__.py b/modules/base_plugins/brew_steps/__init__.py
index b0eb86f..a91dec5 100644
--- a/modules/base_plugins/brew_steps/__init__.py
+++ b/modules/base_plugins/brew_steps/__init__.py
@@ -170,8 +170,8 @@ class BoilStep(StepBase):
     hop_4_added = Property.Number("", default_value=None)
     hop_5 = Property.Number("Hop 5 Addition", configurable=True, description="Fifth Hop alert")
     hop_5_added = Property.Number("", default_value=None)
-    fining = Property.Number("Fining Addition", configurable=True, default_value=15)
-    fining_added = Property.Number("",default_value=None, description="Fining Agent Alert")
+    fining = Property.Number("Fining Addition", configurable=True, default_value=15, description("Fining alert"))
+    fining_added = Property.Number("",default_value=None)
 
     def init(self):
         '''
diff --git a/modules/recipe_import/beerxml.py b/modules/recipe_import/beerxml.py
index db453b7..8f0a702 100644
--- a/modules/recipe_import/beerxml.py
+++ b/modules/recipe_import/beerxml.py
@@ -91,11 +91,7 @@ class BeerXMLImport(FlaskView):
         e = xml.etree.ElementTree.parse(self.BEER_XML_FILE).getroot()
         return float(e.find('./RECIPE[%s]/BOIL_TIME' % (str(id))).text)
 
-<<<<<<< HEAD
     def getMashinTemp(self, id):
-=======
-def getMashinTemp(self, id):
->>>>>>> 15a4f40339611ccf99c4e0db8a5f02c6f6c9b391
         e = xml.etree.ElementTree.parse(self.BEER_XML_FILE).getroot()
         tempstr = e.find('./RECIPE[%s]/MASH/MASH_STEPS/MASH_STEP/INFUSE_TEMP' % (str(id))).text
         val = tempstr[:-1]