conflict solve and delete unwanted folders