Change merge
Revert "Change merge"

This reverts commit 653390d970a661a40604d853f07327abbe25851d.