delete conflict
Merge pull request #8 from Altoros/nats

delete conflict