fix merging errors