fix duplicate org checker
Merge bootstrap