fixing further merging errors