Fix Merge Issues In GoogleAPIConnector