[s3cmd-git] bump, conflict