another Game Master conflict fixed`