One day, Rohan and Maya made changes to the same file, and when Rohan tried to push his changes, GitHub Desktop alerted him to a conflict. Rohan used the built-in conflict resolver in GitHub Desktop to resolve the conflict, and he was able to merge Maya's changes into his branch.