59 i know how to resolve conflicts#41

vvr25 merged 2 commits intovvr25:mainvvr25/project-management-github-activity:mainfrom

TheDiamondSkyv32:59-i-know-how-to-resolve-conflictsTheDiamondSkyv32/project-management-github-activity:59-i-know-how-to-resolve-conflictsCopy head branch name to clipboard