Fix .gitconfig after merge
Add cam to git aliases