fix some conflict