Added a line from our desktop
Fixed a conflict