fixed some conflict bugs

conflicts are added/removing automagically