finish the upload beauty
fix confict