Allow user to override an existing scar when uploading
Remove duplicate file from wrong merge