[WIP] block merge work; global merge does not