gemify works\!
fixed merge conflicts