desktop edit
fixed conflict