Fix liquid derp :)
Merge pull request #1 from CPA-Poke/kitkat

Remove merge conflict