added merge plist+firebase