GitHub repository: pcaicedo/resolve-merge-conflicts
Description: GitHub course Lab 6