project was clean uped
project was clean uped
was added "plugins","modules"
conflict was resolved