dd
solve merge conflict
modify gemfile
rebuild