Fixed issue after rebase
Fixed issue after rebase

Kirzi/flairhq,YaManicKill/flairhq,robertdyjas/flairhq,pokemontrades/flairhq,robertdyjas/flairhq,YaManicKill/flairhq,Kirzi/flairhq,pokemontrades/flairhq