Completed add tournament facility
resolving conflicts