Made some merge conflicts