Revert "Revert "fix conflicts""

This reverts commit e9c8289e2918a02a78bbee9d2cb8d8ba36e3e359.