fixed last conflict in a block return.