fixed merge/upload bug