add an alias for showing files with conflicts
add an alias for "git flow feature"