Revert "clear conflicts"

This reverts commit 60ec6a6a507f533acd29ce9fb64ec124c31bd0a0.