Merging changes
Fixed merges