Fixed merge conflicts

app/views/layouts/fields/_actions.html.haml

@@ -4,5 +4,5 @@
 			%a.facebook-sign-in.button{href: '/oauth/facebook'}
 				= _ action.to_s			
 		- else
-			%button{id: action.to_s, name: action.to_s, type: 'submit'}
+			%button{id: action.to_s, name: action.to_s, type: 'submit', formnovalidate: ([:cancel, :previous].include? action.to_sym)}
 				= _ action.to_s

app/views/layouts/fields/_default.html.haml

@@ -4,7 +4,7 @@
 	- if @options[:help]
 		%p.help=_(("form.#{@options[:_controller]}.#{namekey}.help"), :w, 20)
 	- @label = @label_template ? (render ('layouts/fields/label_' + @label_template)) : nil
-	= @label_position == :before && @label ? @label : ''
+	= (@label_position == :before || @label_position == :inside) && @label ? @label : ''
 	- if @label_position != :inside
 		%div=@html
 	= @label_position == :after && @label ? @label : ''