Slightly altered
Merge remote-tracking branch 'origin/branch' into branch
Merge remote-tracking branch 'origin/branch' into branch
merged.