Fixed merging issues