Resolve with conflicts