Conflicts Merged