making sure it's committed
making sure it's committed
Merge branch 'removing-dirname-basename-from-query'