Fixed merging issues
Fixed merging issues part 2