fixing merging errors