Add project id to database
Resolve merge conflict in migration