missed merge conflict block, fixed