Add cooks
Resolve conflicts