UI Updates
post conflict resolution commit