Fixing merging errors and texts