added procfile for sidekiq
fixed merge conflicts