Really fixed the merge conflict