README.md	merge=keepmine
plugin/README.md	merge=keepmine
build.gradle	merge=keepmine
.gitignore	merge=keepmine
package.json	merge=keepmine
build	merge=keepmine