removing some conflicts notes