changing migrations
conflict merged