Added merge&diff tools for intellij + file restore alias