GitHub repository: tylero-test/resolve-merge-conflicts
Description: My fork for lab6