remove and ignore tmp files, update db seed
merge
merge: