Added support for conflicts in spanish between machines