corrections
Handling merge