clean start
resolve with theirs
clean start