delete help circle
Fix conflicts