local commit
Merge remote-tracking branch 'origin/master'
newest version, just 1 more error and 2 more failures