My mistake! I merged that file by hand.