remove a few (see ...) from names
Merge remote-tracking branch 'origin/master'