Deleting conflicts, adding controls