Revert "Removed conflicts thing"

This reverts commit e63aad9319a3f70b877a426187546cffb00c36ef.