add gems
idk what i did
add merge