added cleared/conflicted logic and display