GitHub repository: vjburic1/resolve-conflicts
Created: 2022-10-29T07:45:12Z
Description: Exercise in resolving merge conflicts