Changes
Fixed merge conflicts