fixing conflict

null query files conflicted