fixed one conflict problem

block problem