clearing out conflict