Added view change if a conflict is clicked