English corrections
handling merge