Merge branch desktop into master
Merge branch desktop into master
Merge branch desktop into master
Merge branch desktop into master
Merge branch laptop into master
Merge branch laptop into master
Merge branch laptop into master
Merge branch desktop into master
Merge branch desktop into master
fixing merge conflict