Revert "Conflict fix"

This reverts commit 44b6b3f9e9f54f71609b144582479cf5f7ef2a23.
Revert "Mapping"

This reverts commit b2a629fc9e48a6654c8fa50454d5f7c8af764b53.