Revert "Revert "clear conflicts""

This reverts commit f8f64a65862ff9502a0d18921cdf35cb56533fef.