Fixes issue #175
Had to remove duplicate constant definitions from a merge operation.