resolved conflict with so and so func