remove conflict panel border setting