Fix for newloan upload file
Fixed conflicts