Revert "Merge conflicts"

This reverts commit a914f70d63cb404b2ea7dc3ccac7b8cf9d1a69d7.