deleted unwanted migrations
fixed merge conflict