Resolves merging errors.