Test conflict#2