fix stray merge header.