Revert "Conflicts"

This reverts commit c2b26eb687471f9798d05047ea447a8883cfed08.