Github pull request without conflicts (full explanation)

Right-click 'Download' and select 'Save Link As' if the file opens in a new tab.