zap method already defined in Billable concern; fix failing test due to rolify gem upgrade
zap method already defined in Billable concern; fix failing test due to rolify gem upgrade

quoideneuf/pop-up-archive,quoideneuf/pop-up-archive,quoideneuf/pop-up-archive,quoideneuf/pop-up-archive