merging errors resolved