oops, missed block move in the merge now fixed