Correction in README.rm, cleaned conflict