i have upates
conflict resolved
conflict resolved 2