Manifest updated to support API 11+
Fixed merge errors