fixed match query file
resolved conflict