Fixed clear conflict.