Pasta 7
Resolve pasta conflict