Failed to clean up stash conflict

Update the git sha appropriately