fixed merging errors