Fixed up some merging errors.  + alignment with R login message