Merging
Fixed merge conflicts