changed difftool to p4merge too