modified common.libbun
fix conflict