Changing install / git commit order
Adding option not to open edit on merge
Merge conflicts