Shall I remove the With => End With part when unmerging?