jgdsa
conflict solved