- fixed conflict bug