Tests for code merging repaired.
5 files changed