Merging
Fixed merge conflict