I still dont know how conflicts

arefaekr n