commit 2 local
upload local merge