Removed SOIL files
Resolving conflicts