Fixed accidentally checked-in merge conflicts.