Finished implementing conflicts UI