clean
merge & fix issue