resolved non-conflict