CFY-443 fixed conflicts lookup bug