added line on desktop
fixed conflict