asdaRevert "vers 2"

This reverts commit 302e536cf0f8eddd2ca4c2656d1d6718295ba5cd.
solve conflict