GitHub repository: tipsiii/Resolve-merge-conflicts
Created: 2023-04-10T19:30:46Z
Description: Resolve merge conflicts exercise.