Fixed weirdness that happened from me being a newbie at merging.