Dev ops up and running.
Fixed migrations merge conflict. Pray for an auto merge.