Fixed conflicts and removed opinion about conclusions, as they are already written
Fixed conflicts and removed opinion about conclusions, as they are already written

JJ/modeling-volunteer-computing,JJ/modeling-volunteer-computing,JJ/modeling-volunteer-computing,JJ/modeling-volunteer-computing