Rostercard and Rostercardplayer model added
merged conflict on a temp database file