merged, resolved conflicts