Fix Article migrations. Should be good now.
Fix merge conflict.