Make sure '0' get cast as 0 in operation cast
fixing merge conflict in Operation from merge