Replaced MergeTools command by Conflicts command and added test