Closed TheBigTig24 closed 8 months ago
rahh
Hey, to resolve your merge conflicts, git pull from main. Then add and commit your changes!
rahh