#1015-MyCards will take NumberCards instead of string
removed xlint warning throughout the project
merge fixed for NumberCard