Recreated first migration
conflict solved
Merge branch 'master' of https://github.com/RedeHost/task.io.git