merge-conflict issues