remove merge conflicts from c9d9b43.