Adding migrations to git
merging