Fix merging errors