added resolve merge conflcits#4

dp787 merged 1 commit intomaindp787/project-management-github-activity:mainfrom

3-i-dont-know-how-to-resolve-merge-conflicts-properlydp787/project-management-github-activity:3-i-dont-know-how-to-resolve-merge-conflicts-properlyCopy head branch name to clipboard