Fix merging issues