Added line on desktop
Fixed conflict