feat: #18 Add a conflict resolution view