Test merging file changes