fix conflict and regenerate