Resolve others conflict