add a line from desktop
fixed conflict