Revert "Merge test"

This reverts commit 27360b4d774c85ff11a3af7c05e34a6d03aa82aa.