some changed
conflict resolved