trigger
conflict resolved