Revert "test_merge_2 merge"

This reverts commit 35aa693321d58e9356eeea7162606eb661b5ce26.