Conflicted Change Part-1