Fixing mergin errors

merging errors