migrating to mysql
resolving conflicts