Show Source of Conflict

Fixes #256