changes
conflicts
updates. trying to move everything to computed.