Update yeoman
Resolve conflict