made change
resolve with theirs