Removing FileMerge as mergetool

Fixes "More than one value for the key merge.tool" error.