Resolving Issue #3
Merging conflicts