Added function GitConflict.
Added git aliases.