Redo conflicting billing migration after merging develop.