Replaced MergeTools command by Conflcit command and added test
Merge pull request #69 from volaya/conflicts_command

Replaced MergeTools command by Conflicts command and added test