fix 30 limit problem
fix merge conflicts