Updating for this week
Fixing merge conflict.
Updating website.