Added line from desktop
Fixed a conflict