updated compass gem
fixed merge