Fix merging bugs