updated tournament queries
fixed up merge conflicts