resolve query conflict