Fix conflicts

db/schema.rb

@@ -12,6 +12,7 @@
 # It's strongly recommended that you check this file into your version control system.
 ActiveRecord::Schema.define(version: 20160308212903) do
+
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"