modified db
resolved conflict db
Removed db tracking to prevent conflicts