fixed reference problem with burning bush in main
fix merge conflicts