fixes bug where a merge should happen but was not
fixes bug where a merge should happen but was not

dispatchrabbi/canjs,Psykoral/canjs,Psykoral/canjs,rjgotten/canjs,Psykoral/canjs,bitovi/canjs,dispatchrabbi/canjs,beno/canjs,shiftplanning/canjs,asavoy/canjs,gsmeets/canjs,tracer99/canjs,rjgotten/canjs,tracer99/canjs,beno/canjs,Psykoral/canjs,patrick-steele-idem/canjs,asavoy/canjs,rjgotten/canjs,whitecolor/canjs,ackl/canjs,rasjani/canjs,rasjani/canjs,rasjani/canjs,whitecolor/canjs,tracer99/canjs,whitecolor/canjs,UXsree/canjs,shiftplanning/canjs,bitovi/canjs,beno/canjs,patrick-steele-idem/canjs,gsmeets/canjs,ackl/canjs,rjgotten/canjs,patrick-steele-idem/canjs,ackl/canjs,rasjani/canjs,bitovi/canjs,bitovi/canjs,UXsree/canjs,gsmeets/canjs