Fixed merging errors?