Revert "Git merge test"

This reverts commit 09c4e44ce010d47fed8aa2d8e2470c777dad886c.