resolve frozen conflicts