fixed merge wierdnesses - matchers imports and duplicate properties