update
modefied confilt