Add development gems
Fix merge errors