game master screen changed
merge fixed