Added local Rscripts to repo
fix merge conflicts