Revert "Test conflit"

This reverts commit dca7a9c111de25a81ea50a7f69dd59c8b3574acc.