#7 issue Solved the migration problem in application
solved the conflict problem