Conflict-Informer

Not the cleanest solution, but one less blocker in the world.