commiting because git is being weird
playing with beer animations
fixing merge conflict