resolve conflicts
Merge branch 'RomanTsegelskyi-survdiff'