icon changes
new seed data
fixed conflict