conflict resolved
devDep cleaned up