*:resolve conflict