remove local variables from difference calculation and switch to read/write approach
resolve merge conflict in MethodFeatures