Added conflict checking and renamed Table.schema -> Table.flock