upload JV
fix conflict