rollback commit before project rename. merge with local updates