[WIP] queries for merge