fixed some problems added a couple gems
fixed conflict