Learning about Version Control by Hugo Kwok Solving merge conflicts takes conscious effort, but I can do it! Like: Version control makes the work organise and tidy. Disadvanatge: Merging conflicts sometime can be difficult and interupt the workflow.