Added conflict viewing and navigation plugins.