Before revision: A combination of those two styleswould be called mixed .
After revision: A mixed competition combines these two styles .