Resetingg for a re-merge