updated to test resolution conflicts.