triggers adjustments
conflict fixed