Add signals for counter buttons in conflict dialog + refactor