Revert "deleted conflicts..."

This reverts commit a2c8cdff92853b778028d65065c8e2e050eca5ec.