Merge branch 'master' of /Users/macbookdata/IdeaProjects/DifferentialSnapshots with conflicts.
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Block reading partial state.