fixes [ci skip]
resolve merge [ci skip]