Update some conflict error