fix multiple commits