corection on board and make up the UI
resolutions of conflicts