GitHub repository: luizaandrade/merge-conflict
Created: 2022-10-20T21:54:47Z
Description: Just an example of a merge conflict