Show conflicts as well!