(This time) fixed merge conflicts