Revert "Remove conflict"

This reverts commit 30a48e61df557a565eef2b18477dc84b726d4bba.