Fixing merging errors