added transaction for file upload
conflict auflösung