Author: LI SHUHANG
Solving merge conflicts takes conscious effort, but I can do it!
what I like about version control is that it help us to do the proejct more efficent, eveeryones work can be tracked.
the challenage part is that we usually face the merge conflict especially we have many people.