deleted compound-generated files
Generated with mean.io
Fixed conflicts