fixed conflict issues