fix for some advanced conflict bug