Fix merging issue