fixed EOH because i don't know what cwd means
Merge remote-tracking branch 'origin/master'