clean up bad merge, update some gems