Remove choice conficts