commiting good state of files before resolving path issue