inplace->trackChange
Conflicts resolved
....
Dirty flag v0.5