Local db migrate test
Fixed conflicts