Extended 'show' and 'conflict' commands

This fixes #427 and adds some extra functionality to the show command.

Also, it extends the functionality of the 'conflicts' command, so it can overcome the  limitations of the 'show' command that were detected by #427