fix some conflict errors