merge conflict
keep the uploads dir