removed conflicting Gemfile~
I think this worked Dan.
Merge branch 'master' into laptop
Dan