added default location for difference resolution
Merge Branch