Testing conflicts 7
solving conflicts