Resolved conflict against Redmine Gemfile