Comment by carc1n0gen

Having to resolve merge conflicts of scripts I never touched during an upgrade