decorator chnaged
view changes
conflict resolved