feat(css-blocks): Conflict Resolution Validator

  - Added conflict resolution validator
  - Added resolution tracker to PropertyContainer
  - Refactored BlockParser into feature packages

Author: amiller-gh

.gitignore

@@ -4,3 +4,5 @@ docs/
 coverage/
 build/
 .DS_Store
+lerna-debug.log
+yarn-error.log

package.json

@@ -1,14 +1,8 @@
 {
   "private": true,
-<<<<<<< HEAD
   "devDependencies": {
     "lerna": "^2.5.1"
   },
-=======
-	"devDependencies": {
-		"lerna": "^2.5.1"
-	},
->>>>>>> 65ec8b6... Squash with 4420cd6e5efaf53b5c9ae2a2c4bfd82407cb4373
   "workspaces": [
     "packages/*"
   ]