Merge conflicting migrations

[blueyed]

No description provided.

[codecov]

Codecov Report

❗ No coverage uploaded for pull request base (master@b44ab13). Click here to learn what that means.
The diff coverage is n/a.

@@           Coverage Diff            @@
##             master    #451   +/-   ##
========================================
  Coverage          ?   99.4%           
========================================
  Files             ?      34           
  Lines             ?    1682           
  Branches          ?     144           
========================================
  Hits              ?    1672           
  Misses            ?       5           
  Partials          ?       5

Flag	Coverage Δ
#py27dj110	99.4% <ø> (?)
#py27dj111	99.4% <ø> (?)
#py27dj18	99.4% <ø> (?)
#py34dj110	99.4% <ø> (?)
#py34dj111	99.4% <ø> (?)
#py34dj18	99.4% <ø> (?)
#py34dj20	99.4% <ø> (?)
#py35dj110	99.4% <ø> (?)
#py35dj111	99.4% <ø> (?)
#py35dj18	99.4% <ø> (?)
#py35dj20	99.4% <ø> (?)
#py36dj111	99.4% <ø> (?)
#py36dj20	99.4% <ø> (?)
#py36dj20psql	99.4% <ø> (?)

---

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update b44ab13...d591da5. Read the comment docs.