resolve conflicts between GData and ShareKit
resolve conflicts between GTL and GData.