resolve some conflicts by commenting them