Update repository.spring.xml

Removing the merge <<<