commit before rename