Campuccino #96

On the conflict