add conflict leezche