changed mergetool to p4merge, removed autocorrect