Fn: Resolve conflict. :(