Conflict Test
Resolve Conflict