Github concepts
Solving conflicts