add upload
commit
rm temp
fix mergen