Populate database with rake:seed
fixed conflicts