add a conflicts guide