Allow arbitrary tags that contain the string 'conflict'

Solves #118