added a line on desktop
Fixed a conflict