Use 'command' to avoid recursive calls
Add elentok's git_conflicts aliases

From here: http://git.io/YnWeQw