learning-about-version-control author: Yuhan Fan Solving merge conflicts takes conscious effort, but I can do it! like: I can pick the theme that I like while coding. dislike: sometimes resolving merge conflicts can be confusing.