Fixed the kick (bad merge)