remove leftover conflict marker from gemspec