fix SM_AUTO_SLICE bug
resolve conflicts