Ivan, I did my best to fix the merge conflict that was in PR #213 so it could be merged, then I went ahead and merged it.
- https://github.com/apache/tomee/pull/213 The approach I took was to remove the `examples/mp-metrics-counted/README.md` file that was causing the conflict. What I don't know if there were changes in there that need to be applied to the new `examples/mp-metrics-counted/README.adoc` Can you do a quick look at the `examples/mp-metrics-counted/README.adoc` and see if there is any text that needs to be updated? -- David Blevins http://twitter.com/dblevins http://www.tomitribe.com
