added rule for fizz
fixed merge issues