Add match field with tooltip to game form
Fix merge conflict