I think this will finally give us working zone2sql merge