Fix directory problem. Refactoring ConflictShower and ConflictWidget for proper use