merge with the work folders
Merge remote-tracking branch 'upstream/master'