Correction of error while merging conflicts from master