Impl android feature and merge local conflict