Ordered status by created_at time
Fixed merge error in heroku