commit after rebase of upload-image branch?