fix version
fix to js
fix conflict on migration
fix conflict on migration 2
fix conflict on migration 3
fix merge conflict