capture fix
conflict resolve