FK-26 Fix gemfile conflicts

Gemfile had conflicts that were not resolved in the last merge. Fix them.