fixing south migration conflict