merge non-resolved conflicts