Learning about Version Control Author: Rico Chan Solving merge conflicts takes conscious effort, but I can do it! One challenging aspect of version control is resolving complex merge conflicts.