Added overflow declaration
conflict resolution