Integer parsing
Merging Conflicts