fixed migration conflicts
?
deleted dsstore files and ngrok