comments & refactoring
fixed AlternativeUriNavigator file name
fix conflicting statements passed to resolution function not mapped
refactoring
refactoring
new CR refactoring
pass resource description properties to conflict resolver
refactor new CR - remove unneccessary parameters
new CR - implemented resolution of resource description properties
new CR - added cycle detection and logging