Fixing Integer problem
Merge conflicts are great.