working on building gems
fixed conflicts