Local changes
Fixed merge conflicts