solved conflicts on migrate files