leave_upload
conflict resolve
salary break up first
add: salary break up