add google play services
integrate push
resolve conflict