Use local paths
Fix merge
Add a probably broken migration