Fixed a couple of merge conflicts