file was renamed during previous commit