Revert "Now the conflict is out"

This reverts commit 15aebcce7ce7916165686a47274bc52d87b2254f.