fix upload
merge
fix detail
last commit