update basic seed data
update ignore file
fix conlicts