Revert "remove conflict"

This reverts commit 580b02d1a10cd383a9df11fd9180839f311f2a95.