Updating to add blur option
Fixing conflicts