changes saved
Fixed Merging issue
Client Registration & email sending completed [Finishes #58859022]