finished clearing out conflicts