migration file corrected
merge conflict resolved
Merge branch 'master' of https://github.com/sm1234/w-etiqt
Merge branch 'master' of https://github.com/sm1234/w-etiqt