- remove merging errors