Accept changes from upstream --strategy-option=theirs"
add files from upstream