Levi is a badass
fixed merge conflict