Fixed two merge conflicts I overlooked.