consolidated git configs
fixed merge conflict, keeping both alias and web defaults