Removed binding.pry
resolved conflicts in seed and schema