Pass method the file instead of it's location
Merge branch 'origin/master'