conflict solved
changes