merge
fix int overflow