Updating xAOD migration
fixed conflit between local and remote repos