Manually edited a migration that was adding a duplicated column since the merge from upstream.