performance measures
conflict resolved performance, Fixes #21