merging + fixing gems