Line from desktop
Fixed conflict