Author: Lixuan Lin
Solving merge conflicts takes conscious effort, but I can do it!
I like most that version control allows me to track changes and collaborate seamlessly with my team.
I find resolving merge conflicts to be the most confusing and frustrating part of version control.