add comment to gemfile
fix merge conflict in gem file