Resolved conflict with master

Too bad git can't add in two things in the same general location at the
same time.