¹Line 24 after the previous two conflicts are solved