module simplenews
marge database
delete newsletter
delete database
marge sql
add module simplenews
marge conflict