fixing merging errors.