add conflicts