modyfying some columns defaults and type
merging and resolving conflicts in db/schema.rb