Adding script and alias to open conflicted files.