Fixed card7seg hex
Fixed merge