Remove merge tags

Remove merge tags left from diff tool