Fixed merging issue