Conflicts managed
merged