No need for the fileutils gem.
Merge remote-tracking branch 'origin/master'