re-do ... merge had some conflicts