Fixed whatever the merge put into my code