alloy conflict resolving