Merging errors fixed