Update alias and set WebStorm to the merge-diff tool