i made things to conflict
conflict cleared