Resolve merge conf