Local changes to R files
Fixing R conflicts