Add a conflict for conflicts sake

Please review this, @casey-collab