Tests for merge
10 files changed