Fixed merging errors