store turn by turn data in castor and save them in the exising database
fix merge conflicts