Resolve previous conflict.