Revert "conflict resolution again"

This reverts commit 8c54103be80dfc0a432be99f2b8529d64e39ba7a.