Trying to get git to work.
Merge remote-tracking branch 'veris6/master'
Something was not committed.