move query files so as not to create a merge conflict