migrations had errors due to git fast-forward