Converted deck struct into class
Fixed merge conflict