committed play services lib
resolve convlicts