little bit change
conflict solved
instructions change