db alters
conflict merge