Change push to upstream
Add log alias for log line summary
Add merge.conflictstyle = diff3