fix merge conflict and move migrition to right folder