Resolve int type conflict