[mesa-freeworld] (2 commits) ...Re-introduce Conflicts - rfbz#6612