added application manifest
fixed merging