fix hiding deleted boxes right border
completed data
no need for conflicts file in repo
no marker 'new' for first step