short git status
Merge branch 'master' into cars