fixed a strange error
conflict resolved