Revert "Making conflicts."

This reverts commit 846ae47f2e1738db79d76bd482bd16f7ffcc487a.