fix merge conflict and gemfile