change to bigger
conflict resolved