fixed conflict #5