add more R notes
solve conflicts