merging
merging
merge confl, returning succes in upload script