* No content check * unit test for no content * fixing merge conflict break * oops during manual merge conflict