Fixed the conflict and merging relations to accomodate three-way merging
Merge branch 'asajUAP' of https://github.com/eskang/validAlloy into asajUAP