cloned current state without conflicted files