Remove zyre conflicts