merge
Removed Manifest
Added set timeout
Merged