deleted development environment
company mailer
implemented strip
conflict removed