fix conflict with shortcut update from devel
fix conflict with shortcut update from devel

jonmc12/heypsycho,JstnEdr/Telescope,SachaG/Gamba,jonmc12/heypsycho,SachaG/Gamba,Discordius/Telescope,HelloMeets/HelloMakers,Discordius/Telescope,rtluu/immersive,bshenk/projectIterate,nathanmelenbrink/theRecord,TodoTemplates/Telescope,dominictracey/Telescope,basemm911/questionsociety,TodoTemplates/Telescope,JstnEdr/Telescope,bengott/Telescope,Discordius/Lesswrong2,dominictracey/Telescope,jonmc12/heypsycho,manriquef/Vulcan,rtluu/immersive,bengott/Telescope,Discordius/Lesswrong2,julienlapointe/telescope-nova-social-news,nathanmelenbrink/theRecord,Discordius/Lesswrong2,TodoTemplates/Telescope,bshenk/projectIterate,manriquef/Vulcan,acidsound/Telescope,HelloMeets/HelloMakers,JstnEdr/Telescope,VulcanJS/Vulcan,manriquef/Vulcan,Air2air/Telescope,bengott/Telescope,HelloMeets/HelloMakers,SachaG/Zensroom,VulcanJS/Vulcan,acidsound/Telescope,basemm911/questionsociety,dominictracey/Telescope,rtluu/immersive,julienlapointe/telescope-nova-social-news,Discordius/Telescope,bshenk/projectIterate,Air2air/Telescope,SachaG/Gamba,julienlapointe/telescope-nova-social-news,basemm911/questionsociety,Air2air/Telescope,SachaG/Zensroom,Discordius/Lesswrong2,acidsound/Telescope,nathanmelenbrink/theRecord,SachaG/Zensroom,Discordius/Telescope