Solve a gemfile conflict bug.