Resolve conflicts in Humbug command class
Resolve conflicts in Humbug command class

humbug/humbug,mleko/humbug,oswaldderiemaecker/humbug,padraic/humbug,mleko/humbug,padraic/humbug,humbug/humbug,JSchwehn/humbug,eniuz/humbug,daniel-mueller/humbug,oswaldderiemaecker/humbug,eniuz/humbug,torreytsui/humbug,torreytsui/humbug,MakiCode/humbug,daniel-mueller/humbug,MakiCode/humbug,JSchwehn/humbug