clarify conflict format