Git did not 3-way merge this quite correctly.