Fine tuning
Update div/mertgool and some git aliases
Update alias and set WebStorm to the merge-diff tool