Fix weird README merge errors