Added a git conflict alias to allow you to easily load all of the conflicting files into vim buffers so you can modify them all at one time.  Thinking about having options to open them in vim tabs or gedit so others people can use the editor of their choice.