resolve merge conflicts

diff --cc README
index 4d5e47823187fd740bf320501de2185dead6f83a,375eb32e113e83765fa205c0f26d7db5659a9ae0..c1d6ed0d2e7fa2d83e531e6037566ed7c58ce938
--- 1/README
--- 2/README
+++ b/README
@@@ -11,5 -11,4 +11,5 @@@ This plugin will be compatible with at 
  API gaps:\r
   - Reuse ComposideBuildProcess and DelegatingBuildProcess\r
   - Use XmlXppAbstractParser#parse(InputSream)\r
 - - Consider reuseing of Maven build trigger/project models
 + - Consider reuseing of Maven build trigger/project models\r
-  - Make server-side PluginDescription contain getPluginRoot() to avoid cast to PluginInfo
++ - Make server-side PluginDescription contain getPluginRoot() to avoid cast to PluginInfo