fixed conflict errors