sor, did i replace urs?

the merge doesn’t look working properly?