Fix auto-rebase on path conflict
Bump manifest 0.2.9