Merge
Fixed merge conflicts