Had to merge migrations