Revert "resolve conflicts 2"

This reverts commit ed7d56e179eaf49382985189700f4593047f4caf.