Revert "fix merge conflicts"

This reverts commit 13abab95187fab0f072c3f307c48f0c9f7f6cb3c.