add build_automation
resolve confilt
solve conflit