Finalized conflict resolution and added some extra functionality to handle '*' cases.