debug task updated
fixed conflict