Change the pandoradb_data.sql for to avoid the conflict in the merge with develop.