merge conflicts

lib/liquid/parser_switching.rb

@@ -25,7 +25,7 @@ module Liquid
     end
 
     def markup_context(markup)
-      "in \"#{markup.strip}\"" 
+      "in \"#{markup.strip}\""
     end
   end
 end

lib/liquid/template.rb

@@ -105,7 +105,6 @@ module Liquid
     def parse(source, options = {})
       @options = options
       @profiling = options[:profile]
-      @profiling = options.delete(:profile)
       @line_numbers = options.delete(:line_numbers)
       @root = Document.parse(tokenize(source), DEFAULT_OPTIONS.merge(options))
       @warnings = nil