binstub gem for production
deleted binstubs
deleted binstubs
resolved the conflict