Resolve friendship bug